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

[Rafael Laboissiere]

Author: rafael
Date: 2009-01-06 15:43:00 +0000 (Tue, 06 Jan 2009)
New Revision: 2577

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Only install enscript files for octave3.0

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-01-06 11:19:48 UTC (rev 2576)
+++ octave/trunk/debian/changelog	2009-01-06 15:43:00 UTC (rev 2577)
@@ -1,6 +1,7 @@
 octave3.1 (3.1.51-2) UNRELEASED; urgency=low
 
   * Synch with octave3.0 package
+  * debian/rules: Only install enscript files for octave3.0
 
  -- Rafael Laboissiere <rafael at debian.org>  Tue, 06 Jan 2009 11:00:00 +0100
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-01-06 11:19:48 UTC (rev 2576)
+++ octave/trunk/debian/rules	2009-01-06 15:43:00 UTC (rev 2577)
@@ -378,8 +378,10 @@
 
 	# install files for the common package
 	dh_movefiles -p$(common_package) --sourcedir=debian/$(PACKAGE)	\
-			usr/share/octave				\
-			usr/share/enscript
+			usr/share/octave
+	-test "$(PACKAGEVER)" = 2.1 -o "$(PACKAGEVER)" = 3.1		\
+		|| dh_movefiles --sourcedir=debian/$(PACKAGE)		\
+			-p$(common_package) usr/share/enscript
 
 	rm -rf $(debtmp)/usr/share/octave $(debtmp)/usr/share/enscript