[Pkg-octave-commit] r1553 - in octave-pkg-dev/trunk: . debian

[Rafael Laboissiere]

Author: rafael
Date: 2008-04-01 12:07:58 +0000 (Tue, 01 Apr 2008)
New Revision: 1553

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Restore PKG_ADD file before running pkg install

Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-04-01 00:35:14 UTC (rev 1552)
+++ octave-pkg-dev/trunk/debian/changelog	2008-04-01 12:07:58 UTC (rev 1553)
@@ -1,3 +1,9 @@
+octave-pkg-dev (0.5.3) UNRELEASED; urgency=low
+
+  * octave-pkg.mk.in: Restore PKG_ADD file before running pkg install
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 01 Apr 2008 12:23:43 +0200
+
 octave-pkg-dev (0.5.2) unstable; urgency=low
 
   * octave-pkg.mk.in:

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-04-01 00:35:14 UTC (rev 1552)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-04-01 12:07:58 UTC (rev 1553)
@@ -48,8 +48,10 @@
 		      [pwd(),'/$(debpkg)/$(bpath)']);		\
 		 pkg ('local_list', [pwd(),'.']);		\
 		 pkg ('global_list', [pwd(),'.']);		\
+		 if (glob ('PKG_ADD.bak')),			\
+		     movefile ('PKG_ADD.bak', 'PKG_ADD');	\
+		 endif;						\
 		 pkg -verbose -nodeps install ."
-	-[ -e PKG_ADD.bak ] && mv PKG_ADD.bak PKG_ADD
 	rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
 	$(shrpkg)/dh/octave-pkg-helper
 	dh_install --package=$(package)