[Pkg-octave-commit] r1111 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2007-12-19 14:41:33 +0000 (Wed, 19 Dec 2007)
New Revision: 1111

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE-emacsen.dirs
   octave/trunk/debian/rules
Log:
* debian/rules: Make sure that the octave.desktop.in and octave-tags
  exist before manipulating/moving them
* debian/in/PACKAGE-emacsen.dirs: Enable some directories only for
  octave2.9

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-12-19 08:42:40 UTC (rev 1110)
+++ octave/trunk/debian/changelog	2007-12-19 14:41:33 UTC (rev 1111)
@@ -1,18 +1,14 @@
-octave2.9 (1:2.9.19-2) UNRELEASED; urgency=low
-
-  * Synched with the last octave2.1 release
-
- -- Rafael Laboissiere <rafael at debian.org>  Tue, 18 Dec 2007 10:01:37 +0100
-
 octave2.1 (1:2.1.73-14) UNRELEASED; urgency=low
 
   * debian/in/PACKAGE-info.prerm: Fixed a typo that was preventing the
     *octave<version> info files from being removed by "install-info
     --remove" (closes: #456636)
-  * debian/rules: Make sure that the octave.desktop.in exists before
-    manipulating/moving it
+  * debian/rules: Make sure that the octave.desktop.in and octave-tags
+    exist before manipulating/moving them
+  * debian/in/PACKAGE-emacsen.dirs: Enable some directories only for
+    octave2.9
 
- -- Rafael Laboissiere <rafael at debian.org>  Tue, 18 Dec 2007 15:11:46 +0100
+ -- Rafael Laboissiere <rafael at debian.org>  Wed, 19 Dec 2007 15:36:52 +0100
 
 octave2.9 (1:2.9.19-1) unstable; urgency=low
 

Modified: octave/trunk/debian/in/PACKAGE-emacsen.dirs
===================================================================
--- octave/trunk/debian/in/PACKAGE-emacsen.dirs	2007-12-19 08:42:40 UTC (rev 1110)
+++ octave/trunk/debian/in/PACKAGE-emacsen.dirs	2007-12-19 14:41:33 UTC (rev 1111)
@@ -1,5 +1,5 @@
 etc/emacs/site-start.d
-usr/bin
 usr/lib/emacsen-common/packages/install
 usr/lib/emacsen-common/packages/remove
-usr/share/man/man1
+[V_2_9:usr/bin
+usr/share/man/man1:]

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-12-19 08:42:40 UTC (rev 1110)
+++ octave/trunk/debian/rules	2007-12-19 14:41:33 UTC (rev 1111)
@@ -113,6 +113,8 @@
 	cp debian/in/$(PACKAGE)-00list debian/patches/00list
 	cp debian/in/$(PACKAGE)-watch debian/watch
 	slice -o $(sliceterm):debian/$(PACKAGE).conf debian/in/PACKAGE.conf
+	slice -o $(sliceterm):debian/$(PACKAGE)-emacsen.dirs	\
+		debian/in/PACKAGE-emacsen.dirs
 	-cp debian/in/$(PACKAGE)-NEWS debian/NEWS
 
 get-orig-source: upstream