From 376d54296d5cd7c9b4e02456d017ed489982a85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Sun, 14 Oct 2012 23:30:02 +0200
Subject: [PATCH 1/4] Replaced last change with directory hoping

---
 makepending | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/makepending b/makepending
index 40f1119..7a31d56 100644
--- a/makepending
+++ b/makepending
@@ -120,8 +120,10 @@ then
         continue
     fi
 
-    $TEST git --git-dir=$WD/.git checkout $DISTRO
-    $TEST git --git-dir=$WD/.git merge master
+    cd $WD
+    $TEST git checkout $DISTRO
+    $TEST git merge master
+    cd $TMP
     echo Upgrading $current at $DISTRO with ${UPSTREAM}_$upstream 1>&2
     echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log
     echo Running makepackage $package $DISTRO at $(date) $LOGS/$DISTRO-$package-$(date +%Y%m%d).log 1>&2

From fa80f518500cbccb86d864e03e27ac2f2fcedc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Mon, 15 Oct 2012 00:16:33 +0200
Subject: [PATCH 2/4] Removed upstart and sysv installs on hardy jail build

---
 makepackage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makepackage b/makepackage
index 346ddb8..f2f1549 100644
--- a/makepackage
+++ b/makepackage
@@ -132,7 +132,7 @@ EOF
     [ $UPSTREAM != hardy -a $UPSTREAM != lucid -a $UPSTREAM != maverick ] &&  echo "force-unsafe-io" > $CHROOT/etc/dpkg/dpkg.cfg.d/02apt-speedup
     $C apt-get update
     [ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install eatmydata
-    $C apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
+    [ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install sysv-rc dpkg sysvinit-utils upstart
     disablescripts
     $C apt-get --force-yes -y dist-upgrade
     $C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache

From 0d963e03d2ade93512bad86d8be835cee7776be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Mon, 15 Oct 2012 00:24:07 +0200
Subject: [PATCH 3/4] Added check for the existance of the binaries to be
 replaced inside the build jais

---
 makepackage | 1 +
 1 file changed, 1 insertion(+)

diff --git a/makepackage b/makepackage
index f2f1549..779d5ff 100644
--- a/makepackage
+++ b/makepackage
@@ -146,6 +146,7 @@ EOF
     then
         for BIN in /bin/uname /usr/bin/arch
         do
+        [ -f $BIN ] || continue
         mv $CHROOT/$BIN $CHROOT/$BIN.orig
 cat << EOF > $CHROOT/$BIN
 #!/bin/sh

From 5f0b0e745dd833b1116d8f72eb8027fed2c746b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Mon, 15 Oct 2012 00:35:05 +0200
Subject: [PATCH 4/4] Fixed patch for previous change

---
 makepackage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/makepackage b/makepackage
index 779d5ff..7dbe2d9 100644
--- a/makepackage
+++ b/makepackage
@@ -146,7 +146,7 @@ EOF
     then
         for BIN in /bin/uname /usr/bin/arch
         do
-        [ -f $BIN ] || continue
+        [ -f $CHROOT/$BIN ] || continue
         mv $CHROOT/$BIN $CHROOT/$BIN.orig
 cat << EOF > $CHROOT/$BIN
 #!/bin/sh