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

[Rafael Laboissiere]

Author: rafael
Date: 2007-12-15 16:35:27 +0000 (Sat, 15 Dec 2007)
New Revision: 1095

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Remove empty dirs in the right place

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-15 12:44:20 UTC (rev 1094)
+++ octave/trunk/debian/changelog	2007-12-15 16:35:27 UTC (rev 1095)
@@ -4,8 +4,9 @@
   * debian/in/PACKAGE-htmldoc.doc-base.*: Replaced tabulations by single
     spaces at the beginning of continuation lines of the Abstract fields
     (cf Debian doc-base Manual section 2.3.2)
+  * debian/rules: Remove empty dirs (usr/{share,lib}/[...]/site/[...])
 
- -- Rafael Laboissiere <rafael at debian.org>  Sat, 15 Dec 2007 12:57:43 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 15 Dec 2007 13:19:17 +0100
 
 octave2.9 (1:2.9.18-1) unstable; urgency=low
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-12-15 12:44:20 UTC (rev 1094)
+++ octave/trunk/debian/rules	2007-12-15 16:35:27 UTC (rev 1095)
@@ -43,6 +43,7 @@
 debbase		:= $(CURDIR)/debian
 debtmp		:= $(debbase)/$(PACKAGE)
 debshare	:= $(debtmp)/usr/share
+deblib		:= $(debtmp)/usr/lib
 debdoc		:= $(debshare)/doc/$(PACKAGE)
 debhtmldoc	:= $(debtmp)-htmldoc/usr/share/doc/$(PACKAGE)-htmldoc
 deblsp		:= $(debbase)/$(emacs_package)/usr/share/emacs/site-lisp/$(emacs_package)
@@ -349,9 +350,12 @@
 
         ## 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 -rf 					$(debini)
 
+	# Remove empty dirs
+	rm -rf $(debshare)/octave/site	\
+		$(deblib)/octave/*/site	\
+		$(deblib)/octave/site
+
 	dh_installdocs -a			README README.kpathsea	\
 						NEWS* PROJECTS THANKS	\
 						BUGS SENDING-PATCHES