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

[Rafael Laboissiere]

Author: rafael
Date: 2008-04-05 15:39:17 +0000 (Sat, 05 Apr 2008)
New Revision: 1569

Modified:
   octave-pkg-dev/trunk/debian/changelog
   octave-pkg-dev/trunk/octave-pkg.mk.in
Log:
Remove packinfo/ChangeLog after pkg install. Also, create a new rule
clean-files for doing that and removing the COPYING file.


Modified: octave-pkg-dev/trunk/debian/changelog
===================================================================
--- octave-pkg-dev/trunk/debian/changelog	2008-04-05 08:46:47 UTC (rev 1568)
+++ octave-pkg-dev/trunk/debian/changelog	2008-04-05 15:39:17 UTC (rev 1569)
@@ -1,3 +1,11 @@
+octave-pkg-dev (0.5.4) UNRELEASED; urgency=low
+
+  * octave-pkg.mk.in: Remove packinfo/ChangeLog after pkg install. Also,
+    create a new rule clean-files for doing that and removing the COPYING
+    file.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 05 Apr 2008 17:38:15 +0200
+
 octave-pkg-dev (0.5.3) unstable; urgency=low
 
   * octave-pkg.mk.in: Restore PKG_ADD file before running pkg install

Modified: octave-pkg-dev/trunk/octave-pkg.mk.in
===================================================================
--- octave-pkg-dev/trunk/octave-pkg.mk.in	2008-04-05 08:46:47 UTC (rev 1568)
+++ octave-pkg-dev/trunk/octave-pkg.mk.in	2008-04-05 15:39:17 UTC (rev 1569)
@@ -32,7 +32,7 @@
 apiversion = $(shell octave-config -p API_VERSION)
 octave_options = --norc --no-history --silent --no-site-file
 
-install/$(package):: create-dirs install-pkg check-pkg remove-dirs
+install/$(package):: create-dirs install-pkg clean-files check-pkg remove-dirs
 
 .PHONY: create-dirs
 create-dirs:
@@ -52,7 +52,6 @@
 		     movefile ('PKG_ADD.bak', 'PKG_ADD');	\
 		 endif;						\
 		 pkg -verbose -nodeps install ."
-	rm -f $(CURDIR)/$(debpkg)/$(mpath)/$(pkgname)-*/packinfo/COPYING
 	$(shrpkg)/dh/octave-pkg-helper
 	dh_install --package=$(package)
 
@@ -86,6 +85,10 @@
 		 $(CURDIR)/$(debpkg)/$(mpath)	\
 		 $(CURDIR)/$(debpkg)/$(bpath)
 
+.PHONY: clean-files
+clean-files::
+	( cd  $(shell find . -name packinfo) ; rm -f COPYING ChangeLog )
+
 DEB_MAKE_CLEAN_TARGET = -C src clean
 
 clean::