From a02b481e9ff33913b38b7bb9d16d1473a8a8995c Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 20 May 2011 19:17:34 +0000
Subject: no longer do dapper

git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@481 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
---
 build-tor-sources | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'build-tor-sources')

diff --git a/build-tor-sources b/build-tor-sources
index 8130d89..c622b50 100755
--- a/build-tor-sources
+++ b/build-tor-sources
@@ -207,20 +207,20 @@ bp2 $DIR $ORIGTAR
 
 # DAPPER  (EOL: June 2011)
 #################################################
-bp1 $DIR $sid_debian_version dapper
-if grep -q texlive "$DIR/debian/control"; then
-	sed -i -e '/^Build-Depends:/ s/texlive[a-z0-9-]*,\? *//g;  /^Build-Depends: / s/$/, tetex-bin, tetex-extra/' "$DIR/debian/control"
-	( cd $DIR; dch "Revert Build-Depends to tetex for backport" )
-fi
-sed -i -e 's/source:Version\|binary:Version/Source-Version/' "$DIR/debian/control"
-(cd $DIR; dch "Change source:Version and binary:Version to Source-Version in depends")
-(echo "/Conflicts:"; echo d; echo w) | ed "$DIR/debian/control"
-sed -i -e 's/move_away_keys=1/: ;# not on this version of debian# move_away_keys=1/' "$DIR/debian/tor.postinst"
-(cd $DIR; dch "No need to move away keys on dapper")
-sed -i -e '/^Build-Depends:/ s/ghostscript/gs/' "$DIR/debian/control"
-(cd $DIR; dch "Build-Depend on gs instead of ghostscript")
-(cd $DIR; hardening_backport 1)
-bp2 $DIR $ORIGTAR
+#bp1 $DIR $sid_debian_version dapper
+#if grep -q texlive "$DIR/debian/control"; then
+#	sed -i -e '/^Build-Depends:/ s/texlive[a-z0-9-]*,\? *//g;  /^Build-Depends: / s/$/, tetex-bin, tetex-extra/' "$DIR/debian/control"
+#	( cd $DIR; dch "Revert Build-Depends to tetex for backport" )
+#fi
+#sed -i -e 's/source:Version\|binary:Version/Source-Version/' "$DIR/debian/control"
+#(cd $DIR; dch "Change source:Version and binary:Version to Source-Version in depends")
+#(echo "/Conflicts:"; echo d; echo w) | ed "$DIR/debian/control"
+#sed -i -e 's/move_away_keys=1/: ;# not on this version of debian# move_away_keys=1/' "$DIR/debian/tor.postinst"
+#(cd $DIR; dch "No need to move away keys on dapper")
+#sed -i -e '/^Build-Depends:/ s/ghostscript/gs/' "$DIR/debian/control"
+#(cd $DIR; dch "Build-Depend on gs instead of ghostscript")
+#(cd $DIR; hardening_backport 1)
+#bp2 $DIR $ORIGTAR
 
 
 # HARDY  (EOL: April 2013)
@@ -228,6 +228,8 @@ bp2 $DIR $ORIGTAR
 bp1 $DIR $sid_debian_version hardy
 (echo "/Conflicts:"; echo d; echo i; echo "Conflicts: libssl0.9.8 (<< 0.9.8g-4ubuntu3.1)"; echo . ; echo w) | ed "$DIR/debian/control"
 (cd $DIR; dch "Conflict with libssl0.9.8 (<< 0.9.8g-4ubuntu3.1) on hardy")
+# hardy's dpkg-parsechangelog cannot deal with dots in the distribution field, remove them.
+(cd $DIR; dch --force-distribution --distribution "$(dpkg-parsechangelog | grep-dctrl -n -s Distribution '' | tr -d .)" '')
 (cd $DIR; hardening_backport 0)
 bp2 $DIR $ORIGTAR
 
-- 
cgit v1.2.3