[Trisquel-devel] Rev 52: Improved build-depend handling in file:///home/bzr/package-helpers/trunk/

[Ruben Rodriguez]

At file:///home/bzr/package-helpers/trunk/

------------------------------------------------------------
revno: 52
revision-id: ruben en trisquel.info-20120610023530-b3v4n05ecqc9a2ky
parent: ruben en trisquel.info-20120609150236-55w30frhkfycctru
committer: Ruben Rodriguez <ruben en trisquel.info>
branch nick: trunk
timestamp: Sun 2012-06-10 04:35:30 +0200
message:
  Improved build-depend handling
------------ pr�xima parte ------------
=== modified file 'helpers/oneiric/config'
--- a/helpers/oneiric/config	2012-05-30 22:13:23 +0000
+++ b/helpers/oneiric/config	2012-06-10 02:35:30 +0000
@@ -63,7 +63,8 @@
 EOF
 
 replace(){
-find $3 -type f |grep -v changelog |grep -v copyright | xargs sed -i s^"$1"^"$2"^g
+#find $3 -type f |grep -v changelog |grep -v copyright | xargs sed -i s^"$1"^"$2"^g
+find $3 -type f -not -iregex '.*changelog.*' -not -iregex '.*copyright.*' -execdir sed --follow-symlinks -i s^"$1"^"$2"^g {} \;
 }
 
 changelog(){
@@ -99,7 +100,7 @@
     apt-get source linux-libc-dev --download-only
     dpkg-source -x --skip-patches *.dsc source
 else
-    #apt-get --force-yes -y build-dep $PACKAGE
+    [ 1$LOCALDEPENDS = 1true ] || apt-get --force-yes -y build-dep $PACKAGE
     apt-get source $PACKAGE --download-only
     dpkg-source -x --skip-patches *.dsc source
 fi
@@ -122,8 +123,6 @@
     DEPENDS=$(sed -n '/Build-Dep/,/^[a-zA-W0-9]/ p' debian/control | head -n -1 | sed 's/.*://; s/(.*)//; s/,//g' |xargs echo -n)
     echo Installing Build-Depends: $DEPENDS
     apt-get --force-yes -y install $DEPENDS
-else
-    apt-get -y --force-yes build-dep $PACKAGE
 fi
 
 PROCESSORS=1

=== modified file 'helpers/oneiric/make-update-manager'
--- a/helpers/oneiric/make-update-manager	2012-04-05 03:30:56 +0000
+++ b/helpers/oneiric/make-update-manager	2012-06-10 02:35:30 +0000
@@ -39,8 +39,8 @@
 apt-get remove --purge -y nvidia-common  || true 
 apt-get remove --purge -y fglrx-modaliases || true
 
-
-cat > ./DistUpgrade/Trisquel.info << EOF
+rm ./DistUpgrade/Ubuntu.info
+cat << EOF   > DistUpgrade/Trisquel.info
 ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/%s
 
 Suite: $CODENAME
@@ -76,8 +76,7 @@
 CompDescription: Trisquel GNU/linux packages
 EOF
 
-cp ./DistUpgrade/Trisquel.info ./DistUpgrade/Ubuntu.info
-
+rm DistUpgrade/ReleaseAnnouncement
 cat << EOF >  DistUpgrade/ReleaseAnnouncement
 = Welcome to Trisquel GNU/Linux $REVISION '$CODENAME' =
 
@@ -122,6 +121,7 @@
 
 EOF
 
+rm DistUpgrade/DevelReleaseAnnouncement
 cat << EOF >  DistUpgrade/DevelReleaseAnnouncement
 This is a development release, do not install on production systems!
 
@@ -129,6 +129,7 @@
 
 cat DistUpgrade/ReleaseAnnouncement >> DistUpgrade/DevelReleaseAnnouncement
 
+rm DistUpgrade/EOLReleaseAnnouncement
 cat << EOF >  DistUpgrade/EOLReleaseAnnouncement
 = Trisquel GNU/Linux $REVISION '$CODENAME' is NO LONGER SUPPORTED! =
 
@@ -177,7 +178,7 @@
 
 EOF
 
-
+rm DistUpgrade/removal_blacklist.cfg
 cat <<EOF > DistUpgrade/removal_blacklist.cfg
 # blacklist of packages that should never be removed
 trisquel-base
@@ -191,6 +192,7 @@
 update-manager-core
 EOF
 
+rm DistUpgrade/mirrors.cfg
 cat << EOF > DistUpgrade/mirrors.cfg
 http://mirror.fsf.org/trisquel/
 http://es.archive.trisquel.info/trisquel/
@@ -207,6 +209,7 @@
 ftp://ftp.rediris.es/mirror/Trisquel/packages/
 EOF
 
+rm DistUpgrade/DistUpgrade.cfg
 cat << EOF > DistUpgrade/DistUpgrade.cfg
 [View]
 # the views will be tried in this order, if one fails to import, the next
@@ -331,9 +334,11 @@
 EOF1
 chmod 755 DistUpgrade/trisquel-postinstall.sh
 
+rm DistUpgrade/demoted.cfg
 echo > DistUpgrade/demoted.cfg
 
-sed -i 's:changelogs\.ubuntu\.com:packages\.trisquel\.info:g' UpdateManager/*.py DistUpgrade/*.py ./po/*.po UpdateManager/Core/*.py data/meta-release
+#sed -i 's:changelogs\.ubuntu\.com:packages\.trisquel\.info:g' UpdateManager/*.py DistUpgrade/*.py ./po/*.po UpdateManager/Core/*.py data/meta-release
+replace changelogs.ubuntu.com packages.trisquel.info .
 
 sed -i 's/���~Lubuntu/���~Ltrisquel/g; s/���ubuntu/���trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info en trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$')
 #sed -i 's/���~Lubuntu/���~Ltrisquel/g; s/���ubuntu/���trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#http://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info en trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/xubuntu/trisquel-mini/g; s/kubuntu/trisquel-pro/g; s/edubuntu/trisquel-edu/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find | grep py$) $(find | grep '\.glade$')