[Pkg-xfce-commits] r1195 - in scripts: . pbuilder pbuilder/hooks

[Yves-Alexis Perez]

Author: corsac-guest
Date: 2007-04-10 20:37:45 +0000 (Tue, 10 Apr 2007)
New Revision: 1195

Removed:
   scripts/pbuilder/hooks/C10_launch_shell
Modified:
   scripts/desktop-sources.txt
   scripts/goodies-sources.txt
   scripts/pbuilder/pdebuild-sources.sh
   scripts/pbuilder/pdebuild.conf
   scripts/pbuilder/pdebuild.wrapper
Log:
reflect goodies->desktop move to sources

Modified: scripts/desktop-sources.txt
===================================================================
--- scripts/desktop-sources.txt	2007-04-10 20:36:28 UTC (rev 1194)
+++ scripts/desktop-sources.txt	2007-04-10 20:37:45 UTC (rev 1195)
@@ -17,6 +17,9 @@
 thunar http://www.xfce.org/archive/xfce-4.4.0/src/Thunar-0.8.0.tar.bz2
 orage http://www.xfce.org/archive/xfce-4.4.0/src/orage-4.4.0.tar.bz2
 xfdesktop4 http://www.xfce.org/archive/xfce-4.4.0/src/xfdesktop-4.4.0.tar.bz2
+xfce4-terminal http://www.xfce.org/archive/xfce-4.4.0/src/Terminal-0.2.6.tar.bz2
+mousepad http://www.xfce.org/archive/xfce-4.4.0/src/mousepad-0.2.12.tar.bz2
+xfce4-dev-tools http://www.xfce.org/archive/xfce-4.4.0/src/xfce4-dev-tools-4.4.0.tar.bz2
 xfce4 DUMMY
 #xffm http://www.xfce.org/archive/xfce-4.2.3.1/src/xffm-4.2.3.tar.gz
 #xfcalendar http://www.xfce.org/archive/xfce-4.4.0/src/xfcalendar-4.4.0.tar.bz2

Modified: scripts/goodies-sources.txt
===================================================================
--- scripts/goodies-sources.txt	2007-04-10 20:36:28 UTC (rev 1194)
+++ scripts/goodies-sources.txt	2007-04-10 20:37:45 UTC (rev 1195)
@@ -2,7 +2,7 @@
 squeeze http://squeeze.xfce.org/downloads/squeeze-0.1.0.tar.bz2
 thunar-archive-plugin http://download.berlios.de/xfce-goodies/thunar-archive-plugin-0.2.4.tar.gz
 thunar-media-tags-plugin http://goodies.xfce.org/releases/thunar-media-tags-plugin/thunar-media-tags-plugin-0.1.2.tar.bz2
-thunar-thumbnailers http://goodies.xfce.org/releases/thunar-thumbnailers/thunar-thumbnailers-0.1.2.tar.bz2
+thunar-thumbnailers http://goodies.xfce.org/releases/thunar-thumbnailers/thunar-thumbnailers-0.2.0.tar.bz2
 thunar-volman http://download.berlios.de/xfce-goodies/thunar-volman-0.1.2.tar.gz
 xfce4-verve-plugin http://goodies.xfce.org/releases/verve-plugin/verve-plugin-0.3.5.tar.bz2
 xfce4-battery-plugin http://goodies.xfce.org/releases/xfce4-battery-plugin/xfce4-battery-plugin-0.5.0.tar.bz2
@@ -37,11 +37,8 @@
 xfce4-xkb-plugin http://goodies.xfce.org/releases/xfce4-xkb-plugin/xfce4-xkb-plugin-0.4.3.tar.bz2
 xfce4-xmms-plugin http://www.math.washington.edu/~kieroglu/xfce4-xmms-plugin-0.5.1.tar.bz2
 #
-xfce4-terminal http://www.xfce.org/archive/xfce-4.4.0/src/Terminal-0.2.6.tar.bz2
 xfmedia http://spuriousinterrupt.org/files/xfmedia/xfmedia-0.9.2.tar.bz2
 xfkc http://gauvain.tuxfamily.org/code/archive/xfkc/xfkc-0.1.tar.gz
-mousepad http://www.xfce.org/archive/xfce-4.4.0/src/mousepad-0.2.12.tar.bz2
-xfce4-dev-tools http://www.xfce.org/archive/xfce-4.4.0/src/xfce4-dev-tools-4.4.0.tar.bz2
 xfce4-taskmanager http://xfce4-taskmanager.nebulon.de/xfce4-taskmanager-0.4.0-rc2.tar.gz
 xfburn http://foo-projects.org/~pollux/xfburn/xfburn-0.2.0.tar.gz
 xfce4-artwork ftp://ftp.berlios.de/pub/xfce-goodies/artwork/xfce4-artwork-0.1.tar.gz

Deleted: scripts/pbuilder/hooks/C10_launch_shell
===================================================================
--- scripts/pbuilder/hooks/C10_launch_shell	2007-04-10 20:36:28 UTC (rev 1194)
+++ scripts/pbuilder/hooks/C10_launch_shell	2007-04-10 20:37:45 UTC (rev 1195)
@@ -1,6 +0,0 @@
-#!/bin/sh
-# invoke shell if build fails.
-
-echo "You have the shell, use it wisely"
-echo "type CTRL-D to exit"
-/bin/bash < /dev/tty > /dev/tty

Modified: scripts/pbuilder/pdebuild-sources.sh
===================================================================
--- scripts/pbuilder/pdebuild-sources.sh	2007-04-10 20:36:28 UTC (rev 1194)
+++ scripts/pbuilder/pdebuild-sources.sh	2007-04-10 20:37:45 UTC (rev 1195)
@@ -66,8 +66,13 @@
 		        	2> $PBUILDERDIR/log/pbuilder-update-errors.log
 		exit 0
 		;;
+	"login")
+		echo "Entering chroot"
+		[ "$DEBUG" ] || sudo $PBUILDER login --configfile $CONFFILE 
+		exit 0
+		;;
 	*)
-	    echo "Usage: $0 {desktop [pkg]|goodies [pkg]|create|update|clean}"
+	    echo "Usage: $0 {desktop [pkg]|goodies [pkg]|create|update|clean|login}"
 		exit 1
 		;;
 esac

Modified: scripts/pbuilder/pdebuild.conf
===================================================================
--- scripts/pbuilder/pdebuild.conf	2007-04-10 20:36:28 UTC (rev 1194)
+++ scripts/pbuilder/pdebuild.conf	2007-04-10 20:37:45 UTC (rev 1195)
@@ -1,4 +1,5 @@
 # read pbuilderrc.5 document for notes on specific options.
+#PDEBUILD_PBUILDER=cowbuilder
 
 BASEDIR=$HOME/debian/pkg-xfce
 
@@ -10,8 +11,8 @@
 HOOKDIR=$BASEDIR/scripts/pbuilder/hooks
 APTCACHE=$BUILDPLACE
 
-MIRRORSITE=http://debian.fastweb.it/debian
 
+MIRRORSITE=http://ftp.fr.debian.org/debian
 USEPROC=yes
 USEDEVPTS=yes
 USEDEVFS=no
@@ -35,3 +36,4 @@
 		. $PKGXFCEBASEDIR/scripts/pbuilder/pdebuild.conf.local
 	fi
 fi
+PBUILDERSATISFYDEPENDSCMD=/usr/lib/pbuilder/pbuilder-satisfydepends-experimental

Modified: scripts/pbuilder/pdebuild.wrapper
===================================================================
--- scripts/pbuilder/pdebuild.wrapper	2007-04-10 20:36:28 UTC (rev 1194)
+++ scripts/pbuilder/pdebuild.wrapper	2007-04-10 20:37:45 UTC (rev 1195)
@@ -4,5 +4,5 @@
 
 pdebuild --configfile $D/pdebuild.conf \
 	--logfile $D/xfce/log/`basename $(pwd)`-buildd.log \
-		-- --othermirror "deb file:/var/cache/apt/archives ./" \
+		-- --othermirror "deb file:/var/cache/apt/archives ./|deb http://ftp.fr.debian.org/debian/ experimental main" \
 			--override-config --distribution unstable