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

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-05 07:09:20 +0000 (Thu, 05 Feb 2009)
New Revision: 2613

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Install /usr/share/octave/packages in -common package

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-05 01:20:11 UTC (rev 2612)
+++ octave/trunk/debian/changelog	2009-02-05 07:09:20 UTC (rev 2613)
@@ -7,13 +7,14 @@
 
   [ Thomas Weber ]
   * Synch with the lenny branch.  In particular, let Octave provide the
-    /usr/share/octave/packages/ directory (addresses Bug#513576)
+    /usr/share/octave/packages/ directory (addresses Bug#513576), which
+    should be in the octaveX.X-common package
 
  -- Rafael Laboissiere <rafael at debian.org>  Wed, 04 Feb 2009 11:56:17 +0100
 
 octave3.0 (1:3.0.1-6lenny2) unstable; urgency=low
 
- * Provide /usr/share/octave/packages by octave3.0 (closes: #513576)
+  * Provide /usr/share/octave/packages by octave3.0 (closes: #513576)
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Mon, 02 Feb 2009 21:34:22 +0100
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-02-05 01:20:11 UTC (rev 2612)
+++ octave/trunk/debian/rules	2009-02-05 07:09:20 UTC (rev 2613)
@@ -294,7 +294,6 @@
 		 $(debtmp)/usr/bin/octave-depends-$(version)
 	install --mode=644 debian/defs.make \
 		$(debtmp)/usr/share/octave/debian/defs.make-$(version)
-	install -d $(debtmp)/usr/share/octave/packages
 
 	(cd $(debtmp)/usr/share/man/man1; 				\
 		mv -v	octave.1	octave-$(version).1;    	\
@@ -338,6 +337,9 @@
 	-install -p -m 0644 emacs/octave-tags.1			\
 	     $(debbase)/$(emacs_package)/usr/share/man/man1/octave-tags-$(version).1
 
+	# install the directory for Octave packages
+	install -d $(debbase)/$(common_package)/usr/share/octave/packages
+
         ## link the conf.file back from /etc over the version.spec. rc
 	ln -sf /etc/$(PACKAGE).conf 		$(debini)/octaverc