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

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-15 00:40:28 +0000 (Tue, 15 Nov 2005)
New Revision: 321

Added:
   trunk/packages/octave/debian/patches/50_install-liboctinterp.dpatch
Removed:
   trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.1.dpatch
   trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.9.dpatch
Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/octave2.9-00list
Log:
Debian release octave2.9_2.9.4-1


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-14 22:01:33 UTC (rev 320)
+++ trunk/packages/octave/debian/changelog	2005-11-15 00:40:28 UTC (rev 321)
@@ -1,3 +1,16 @@
+octave2.9 (2.9.4-1) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * New upstream release
+  * debian/in/octave2.9-00list:
+    - Removed patch 50_no-check-nested-functions-2.9, which has been
+      applied upstream
+    - Added patch 50_install-liboctinterp, necessary for installing
+      liboctinterp.so in /usr/lib/octave-<version>
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Mon, 14 Nov 2005 22:58:56 +0100
+
 octave2.1 (2.1.72-1) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list	2005-11-14 22:01:33 UTC (rev 320)
+++ trunk/packages/octave/debian/in/octave2.9-00list	2005-11-15 00:40:28 UTC (rev 321)
@@ -1,2 +1,2 @@
 50_mkoctfile.1-no-negative
-50_no-check-nested-functions-2.9
+50_install-liboctinterp

Added: trunk/packages/octave/debian/patches/50_install-liboctinterp.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_install-liboctinterp.dpatch	2005-11-14 22:01:33 UTC (rev 320)
+++ trunk/packages/octave/debian/patches/50_install-liboctinterp.dpatch	2005-11-15 00:40:28 UTC (rev 321)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_install-liboctinterp.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Install liboctinterp.so
+
+ at DPATCH@
+
+--- octave2.9-2.9.4.orig/src/Makefile.in
++++ octave2.9-2.9.4/src/Makefile.in
+@@ -398,12 +398,12 @@
+ 
+ install-oct:
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(octfiledir)
++	$(srcdir)/mk-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD
+ 	if [ -n "$(OCT_FILES)" ]; then \
+ 	  xfiles="$(OCT_FILES)"; \
+ 	  for f in $$xfiles; do \
+ 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(octfiledir)/$$f; \
+ 	  done; \
+-	  $(srcdir)/mk-pkg-add --prefix $(octfiledir) $(DLD_DEF_FILES) > $(DESTDIR)$(octfiledir)/PKG_ADD
+ 	fi
+ .PHONY: install-oct
+ 


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

Deleted: trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.1.dpatch

Deleted: trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.9.dpatch