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

[Rafael Laboissiere]

Author: rafael
Date: 2007-10-15 18:49:21 +0000 (Mon, 15 Oct 2007)
New Revision: 1044

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/rules
Log:
Debian release octave2.9_1:2.9.15-1

Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2007-10-15 14:38:31 UTC (rev 1043)
+++ octave/trunk/debian/changelog	2007-10-15 18:49:21 UTC (rev 1044)
@@ -6,8 +6,12 @@
     + 01_include_missing_files
     + 50_mix-range-and-sparse
 
- -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 14 Oct 2007 16:31:27 +0000
+  [ Rafael Laboissiere ]
+  * debian/rules: Only do extra links for the manpages when we are
+    packaging a pre-release version
 
+ -- Rafael Laboissiere <rafael at debian.org>  Mon, 15 Oct 2007 17:19:21 +0200
+
 octave3.0 (2.9.15-1) experimental; urgency=low
 
   [ Thomas Weber ]

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2007-10-15 14:38:31 UTC (rev 1043)
+++ octave/trunk/debian/rules	2007-10-15 18:49:21 UTC (rev 1044)
@@ -23,6 +23,9 @@
 			perl -nle 'm/.*(\d.\d)/ and print $$1')
 #FIXME: drop PACKAGEVER after the release of 3.0 source packages!
 
+hack:
+	@echo $(PACKAGEVER)
+
 ifeq ($(major),2.9)
 priority	:= 90
 else
@@ -372,9 +375,11 @@
 		usr/share/man/man1/octave-$(version).1.gz \
 		usr/share/man/man1/octave$(major).1.gz
 	# FIXME: The following should be removed after the final 3.0 release
+ifneq ($(PACKAGEVER),$(major))
 	dh_link --package=$(PACKAGE) \
 		usr/share/man/man1/octave$(major).1.gz \
-		usr/share/man/man1/octave$(PACKAGEVER).1.gz \
+		usr/share/man/man1/octave$(PACKAGEVER).1.gz
+endif
 	# make mkoctfileX.Y a symlink and symlink the manpage as well
 	dh_link --package=$(dev_package) \
 		usr/bin/mkoctfile-$(version) usr/bin/mkoctfile$(major)
@@ -382,9 +387,11 @@
 		usr/share/man/man1/mkoctfile-$(version).1.gz \
 		usr/share/man/man1/mkoctfile$(major).1.gz
 	# FIXME: The following should be removed after the final 3.0 release
+ifneq ($(PACKAGEVER),$(major))
 	dh_link --package=$(dev_package) \
 		usr/share/man/man1/mkoctfile$(major).1.gz \
 		usr/share/man/man1/mkoctfile$(PACKAGEVER).1.gz
+endif
 	# make octaveX.Y-depends a symlink and symlink the manpage as well
 	dh_link --package=$(dev_package) \
 		usr/bin/octave-depends-$(version) \
@@ -393,9 +400,11 @@
 		usr/share/man/man1/octave-depends-$(version).1.gz \
 		usr/share/man/man1/octave$(major)-depends.1.gz
 	# FIXME: The following should be removed after the final 3.0 release
+ifneq ($(PACKAGEVER),$(major))
 	dh_link --package=$(dev_package) \
 		usr/share/man/man1/octave$(major)-depends.1.gz \
 		usr/share/man/man1/octave$(PACKAGEVER)-depends.1.gz
+endif
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a