[Pkg-octave-commit] r1078 - octave/trunk/debian

[Rafael Laboissiere]

Author: rafael
Date: 2007-12-08 20:19:42 +0000 (Sat, 08 Dec 2007)
New Revision: 1078

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Really get rid of empty directories in the main octave*.* package
(/usr/share/octve/debian/ and /usr/share/octave/site/m)

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-06 22:22:27 UTC (rev 1077)
+++ octave/trunk/debian/changelog	2007-12-08 20:19:42 UTC (rev 1078)
@@ -7,7 +7,7 @@
       warnings have been introduced in a recent version of dpkg-shlibdeps.
     + Copy version NEWS files from debian/in/ directory into debian/
     + Remove debian/NEWS at clean rule
-    + Remove directory /usr/share/octave from the main octave*.* package
+    + Remove some empty directories from the main octave*.* package
   * debian/in/octave3.0-NEWS: Moved from debian/NEWS
   * debian/control:
     + Dropped the Homepage pseudo-header for the extended description

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-12-06 22:22:27 UTC (rev 1077)
+++ octave/trunk/debian/rules	2007-12-08 20:19:42 UTC (rev 1078)
@@ -338,7 +338,8 @@
 			usr/share/man/man1/octave-depends-$(version).1	\
 			usr/share/octave/debian/defs.make-$(version)
 	rm -r $(debtmp)/usr/include
-	rm -rf $(debtmp)/usr/share/info $(debtmp)/usr/share/octave
+	rm -rf $(debtmp)/usr/share/info
+	rm -rf $(debtmp)/usr/share/octave/debian/
 
 	install -p -m 0644  debian/$(PACKAGE).conf  $(debtmp)/etc
 
@@ -349,7 +350,7 @@
         ## link the conf.file back from /etc over the version.spec. rc
 	ln -sf /etc/$(PACKAGE).conf 		$(debininew)/octaverc
         ## this file would exist under 2.0 and 2.1 with the same name
-	rm -v 					$(debini)/octaverc
+	rm -rf 					$(debini)
 
 	dh_installdocs -a			README README.kpathsea	\
 						NEWS* PROJECTS THANKS	\