SVN devscripts commit: r560 - in trunk: debian scripts

[James Vega]

Author: jamessan
Date: 2007-03-12 18:23:33 +0000 (Mon, 12 Mar 2007)
New Revision: 560

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/scripts/Makefile
   trunk/scripts/bts.pl
Log:
* debian/control: Add myself to the Uploaders list.
* bts: chdir back to the invoking directory before leaving prunecache()
  (Closes: #413793)
* scripts/Makefile: Specify an include directory when running Perl in order
  to handle the source restructuring.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-03-10 21:46:26 UTC (rev 559)
+++ trunk/debian/changelog	2007-03-12 18:23:33 UTC (rev 560)
@@ -73,8 +73,15 @@
     - use bugs.d.o/mbox:NNNN to download the mbox
     - attempt to download version graphs in "full caching" mode
 
- -- Mohammed Adnène Trojette <adn+deb at diwi.org>  Sat, 10 Mar 2007 12:47:13 +0100
+  [ James Vega ]
+  * debian/control: Add myself to the Uploaders list.
+  * bts: chdir back to the invoking directory before leaving prunecache()
+    (Closes: #413793)
+  * scripts/Makefile: Specify an include directory when running Perl in order
+    to handle the source restructuring.
 
+ -- James Vega <jamessan at debian.org>  Mon, 12 Mar 2007 14:18:32 -0400
+
 devscripts (2.9.27) unstable; urgency=low
 
   * checkbashisms: check for 'select' (thanks to James Abley, Ubuntu user)

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-03-10 21:46:26 UTC (rev 559)
+++ trunk/debian/control	2007-03-12 18:23:33 UTC (rev 560)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Devscripts Devel Team <devscripts-devel at lists.alioth.debian.org>
-Uploaders: Julian Gilbey <jdg at debian.org>, Filippo Giunchedi <filippo at debian.org>, Joey Hess <joeyh at debian.org>, Mohammed Adnène Trojette <adn+deb at diwi.org>, Christoph Berg <myon at debian.org>, Stefano Zacchiroli <zack at debian.org>
+Uploaders: Julian Gilbey <jdg at debian.org>, Filippo Giunchedi <filippo at debian.org>, Joey Hess <joeyh at debian.org>, Mohammed Adnène Trojette <adn+deb at diwi.org>, Christoph Berg <myon at debian.org>, Stefano Zacchiroli <zack at debian.org>, James Vega <jamessan at debian.org>
 Standards-Version: 3.7.2
 Build-Depends: perl (>= 5.8), debhelper (>= 5.0.0), libtimedate-perl, libwww-perl, xsltproc, docbook-xsl, po4a (>= 0.26)
 XS-Vcs-Browser: http://svn.debian.org/wsvn/devscripts/trunk/

Modified: trunk/scripts/Makefile
===================================================================
--- trunk/scripts/Makefile	2007-03-10 21:46:26 UTC (rev 559)
+++ trunk/scripts/Makefile	2007-03-12 18:23:33 UTC (rev 560)
@@ -25,7 +25,7 @@
 	bash -n $@
 %.tmp: %.pl $(VERSION_FILE)
 	sed -e "s/###VERSION###/$(VERSION)/" $<  > $@
-	perl -c $@
+	perl -I.. -c $@
 %: %.tmp
 	cp $< $@
 	chmod +x $@

Modified: trunk/scripts/bts.pl
===================================================================
--- trunk/scripts/bts.pl	2007-03-10 21:46:26 UTC (rev 559)
+++ trunk/scripts/bts.pl	2007-03-12 18:23:33 UTC (rev 560)
@@ -2492,6 +2492,8 @@
     return unless -d $cachedir;
     return if -f $prunestamp and -M _ < 1;
 
+    my $oldcwd = getcwd;
+
     chdir($cachedir) || die "bts: chdir $cachedir: $!\n";
 
     # remove the now-defunct live-download file
@@ -2553,6 +2555,7 @@
 	open PRUNESTAMP, ">$prunestamp" || die "bts: prune timestamp: $!\n";
 	close PRUNESTAMP;
     }
+    chdir $oldcwd || die "bts: chdir $oldcwd: $!\n";
     utime time, time, $prunestamp;
 }