[Pkg-octave-commit] rev 576 - in trunk/packages/octave/debian: . in patches

[Thomas Weber]

Author: thomas-guest
Date: 2006-04-20 08:53:08 +0000 (Thu, 20 Apr 2006)
New Revision: 576

Added:
   trunk/packages/octave/debian/patches/50_fix-apiversion-2.9.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/control
   trunk/packages/octave/debian/in/octave2.9-00list
   trunk/packages/octave/debian/rules
Log:
Restore apiversioned directories in 2.9 which are the cause for #362591
Minor cleanup in -emacsen package
Introduce octave-config2.X link in preparation of builds for 2.1 and 2.9


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2006-04-15 04:30:01 UTC (rev 575)
+++ trunk/packages/octave/debian/changelog	2006-04-20 08:53:08 UTC (rev 576)
@@ -1,3 +1,15 @@
+octave2.9 (2.9.5-5) unstable; urgency=low
+
+  NOT YET RELEASED!
+
+  [ Thomas Weber ]
+  * 50_mkoctfile.1-no-negative.dpatch: restore api versioned directories
+  * introduce octave-config2.X symlink in preparation of dual built packages
+    for Octave 2.1 and 2.9
+  * remove dependency on Octave2.0 for -emacsen package
+
+ -- 
+
 octave2.9 (2.9.5-4) unstable; urgency=low
 
   * debian/in/control: Conflicts with octave-forge (closes: #362591)

Modified: trunk/packages/octave/debian/in/control
===================================================================
--- trunk/packages/octave/debian/in/control	2006-04-15 04:30:01 UTC (rev 575)
+++ trunk/packages/octave/debian/in/control	2006-04-20 08:53:08 UTC (rev 576)
@@ -76,7 +76,7 @@
 
 Package: octave[V_2_1:2.1:][V_2_9:2.9:]-emacsen
 Architecture: all
-Depends: octave[V_2_1:2.1:][V_2_9:2.9:] | octave2.0, emacs21 | xemacs21 | emacsen, debianutils (>= 1.6)
+Depends: octave[V_2_1:2.1:][V_2_9:2.9:], emacs21 | xemacs21 | emacsen, debianutils (>= 1.6)
 Replaces: octave (<= 2.0.16-2)
 Conflicts: octave2.0-emacsen
 Provides: octave-emacsen

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2006-04-15 04:30:01 UTC (rev 575)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2006-04-20 08:53:08 UTC (rev 576)
@@ -1,2 +1,3 @@
 50_octave-value-list-resize-2.9
 50_automatic-replot-docstring
+50_fix-apiversion-2.9.dpatch

Added: trunk/packages/octave/debian/patches/50_fix-apiversion-2.9.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_fix-apiversion-2.9.dpatch	2006-04-15 04:30:01 UTC (rev 575)
+++ trunk/packages/octave/debian/patches/50_fix-apiversion-2.9.dpatch	2006-04-20 08:53:08 UTC (rev 576)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_fix-apiversion.dpatch by  <root at localhost>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Switching from 2.9.4 to 2.9.5, upstream changed 'aptversion' to
+## 'api_version' everywhere execpt in configure.in. This results in
+## non-apiversioned m- and oct-direcotries.
+
+ at DPATCH@
+diff -urNad octave2.9-2.9.5~/configure.in octave2.9-2.9.5/configure.in
+--- octave2.9-2.9.5~/configure.in	2006-03-22 23:25:58.000000000 +0100
++++ octave2.9-2.9.5/configure.in	2006-04-19 13:01:06.603336800 +0200
+@@ -77,7 +77,7 @@
+ OCTAVE_SET_DEFAULT(fcnfiledir, '$(datadir)/octave/$(version)/m')
+ OCTAVE_SET_DEFAULT(localfcnfiledir, '$(datadir)/octave/site/m')
+ OCTAVE_SET_DEFAULT(localapifcnfiledir,
+-  '$(datadir)/octave/site/$(apiversion)/m')
++  '$(datadir)/octave/site/$(api_version)/m')
+ OCTAVE_SET_DEFAULT(localverfcnfiledir, '$(datadir)/octave/$(version)/site/m')
+ OCTAVE_SET_DEFAULT(localfcnfilepath,
+   '$(localverfcnfiledir)//$(sepchar)$(localapifcnfiledir)//$(sepchar)$(localfcnfiledir)//')
+@@ -93,7 +93,7 @@
+ OCTAVE_SET_DEFAULT(localoctfiledir,
+   '$(libexecdir)/octave/site/oct/$(canonical_host_type)')
+ OCTAVE_SET_DEFAULT(localapioctfiledir,
+-  '$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)')
++  '$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)')
+ OCTAVE_SET_DEFAULT(localveroctfiledir,
+   '$(libexecdir)/octave/$(version)/site/oct/$(canonical_host_type)')
+ OCTAVE_SET_DEFAULT(localoctfilepath,


Property changes on: trunk/packages/octave/debian/patches/50_fix-apiversion-2.9.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2006-04-15 04:30:01 UTC (rev 575)
+++ trunk/packages/octave/debian/rules	2006-04-20 08:53:08 UTC (rev 576)
@@ -312,6 +312,10 @@
 		usr/bin/octave-$(version) usr/bin/$(PACKAGE)
 	dh_link --package=$(PACKAGE) \
 		/usr/share/man/man1/octave-$(version).1.gz /usr/share/man/man1/octave$(major).1.gz
+	dh_link --package=$(PACKAGE) \
+		usr/bin/octave-config-$(version) usr/bin/octave-config$(major)
+	dh_link --package=$(PACKAGE) \
+		/usr/share/man/man1/octave-config-$(version).1.gz /usr/share/man/man1/octave-config$(major).1.gz
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a