From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Sun, 27 Jan 2008 20:21:09 +0000 (+0100)
Subject: Merge branch 'master' of git.dolda2000.com:/srv/git/r/dcp
X-Git-Url: http://dolda2000.com/gitweb/?p=dcp.git;a=commitdiff_plain;h=10557581a6d203fc90819f3db1504c65fd4770fd;hp=-c

Merge branch 'master' of git.dolda2000.com:/srv/git/r/dcp
---

10557581a6d203fc90819f3db1504c65fd4770fd
diff --combined dcp-init
index 3babd45,68296d5..3730fb6
--- a/dcp-init
+++ b/dcp-init
@@@ -42,7 -42,7 +42,7 @@@ getaptsrc() 
  }
  
  initrepo() {
-     rungit init -q --shared
+     rungit init
      mkdir "$td/control"
      touch "$td/control/conf"
      rungit add control
@@@ -55,11 -55,6 +55,11 @@@ initbase() 
      mkdir "$td/control/update.d"
      cat >"$td/control/functions" <<EOF
  readconf() {
 +    if [ -r "$HOME/.dcp-build-conf" ]; then
 +        while read key val; do
 +            export "CONF_\$key"="\$val"
 +        done <"$HOME/.dcp-build-conf"
 +    fi
      while read key val; do
          export "CONF_\$key"="\$val"
      done <control/conf
@@@ -114,7 -109,7 +114,7 @@@ initapt() 
  
  set -e
  
- cmd=(dpkg-buildpackage -b)
+ cmd=(dpkg-buildpackage -b -rfakeroot)
  if [ -n "\$CONF_MAINTAINER" ]; then
      cmd=("\${cmd[@]}" "-m\$CONF_MAINTAINER")
  fi