[Pkg-octave-commit] rev 466 - in
branches/2.9transition/packages/octave-forge/debian: . patches
Colin ingram
cjingram-guest at costa.debian.org
Mon Jan 23 02:28:30 UTC 2006
Author: cjingram-guest
Date: 2006-01-23 02:28:29 +0000 (Mon, 23 Jan 2006)
New Revision: 466
Added:
branches/2.9transition/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
branches/2.9transition/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
Modified:
branches/2.9transition/packages/octave-forge/debian/changelog
branches/2.9transition/packages/octave-forge/debian/control
branches/2.9transition/packages/octave-forge/debian/patches/00list
branches/2.9transition/packages/octave-forge/debian/rules
Log:
** ported changes from trunk revision 461:465
Modified: branches/2.9transition/packages/octave-forge/debian/changelog
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/changelog 2006-01-22 19:39:18 UTC (rev 465)
+++ branches/2.9transition/packages/octave-forge/debian/changelog 2006-01-23 02:28:29 UTC (rev 466)
@@ -1,3 +1,103 @@
+octave-forge (2005.06.13-11) unstable; urgency=low
+
+ * debian/rules: Explicitly call octave-config-2.1.72 instead of
+ octave-config
+
+ -- Rafael Laboissiere <rafael at debian.org> Sun, 22 Jan 2006 18:45:13 +0100
+
+octave-forge (2005.06.13-10) unstable; urgency=low
+
+ * debian/rules: Reverted last change regarding the update-alternatives
+ octave-config command. Let us hope that the buildd maintainers
+ already fixed the dangling symlink problem.
+
+ -- Rafael Laboissiere <rafael at debian.org> Sun, 22 Jan 2006 00:25:39 +0100
+
+octave-forge (2005.06.13-9) unstable; urgency=low
+
+ * debian/control: Set build-dependency only on libxt-dev, since this
+ package already depends on libx11-dev and x-dev
+ * debian/rules: Added update-alternatives command to clean up the
+ octave-config alternative on Debian autobuilders. This is a temporary
+ hack to get the package correctly autobuilt and will be removed in the
+ future.
+
+ -- Rafael Laboissiere <rafael at debian.org> Sat, 21 Jan 2006 18:47:27 +0100
+
+octave-forge (2005.06.13-8) unstable; urgency=low
+
+ +++ Changes by Thomas Weber
+
+ * remove dependency on xlibs-dev (closes: 345539)
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Mon, 2 Jan 2006 00:16:36 +0100
+
+octave-forge (2005.06.13-7) unstable; urgency=low
+
+ +++ Changes by Rafael Laboissiere
+
+ * debian/rules: Removed code for diagnosing the problem with
+ autobuilders
+ * debian/control: Tighten build-dependency on octave2.1-headers to
+ >=2.1.72-8 (hopefully, this will fix the autobuilder problems, since
+ from this version on, the octave-depends script call octave-config
+ using the full path)
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Sat, 31 Dec 2005 10:15:27 +0100
+
+octave-forge (2005.06.13-6) unstable; urgency=low
+
+ +++ Changes by Rafael Laboissiere
+
+ * debian/patches/50_make-pattern-rules.dpatch: Improved patch. The
+ problem with version 3.81 of make is that it treats pattern rules that
+ are defined as:
+
+ %.o : %.cc ; command $< $@
+
+ and:
+
+ %.o : %.cc
+ command $< $@
+
+ as different rules. Since the former appear in Makeconf, the later
+ definition (which appears in some Makefiles) will not override the
+ former. The patch transforms the later into the former.
+
+ * debian/rules: Added code for diagnosing the problem that some
+ autobuilders (ia64, powerpc, and s390) are having to find the
+ octave-config command.
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Fri, 30 Dec 2005 23:06:29 +0100
+
+octave-forge (2005.06.13-5) unstable; urgency=low
+
+ +++ Changes by Rafael Laboissiere
+
+ * debian/patches/50_make-pattern-rules.dpatch: Patch for avoinding
+ override of pattern rules previously defined in Makeconf.base. A big
+ thanks to Joaquim Ortega <joaquim.ortega at gmail.com> for finding the
+ bug and proposing the changes. The package is building correctly
+ again in sid, with the latest version of make (closes: #344995).
+
+ * debian/rules: Save original configure script before generating a new
+ one with autoconf. Restore the saved file in the clean target, such
+ that the differences will not appear in the .diff.gz file.
+
+ * debian/patches/50_extra-pdb-sinclude.dpatch: Patch for avoiding
+ failures in make clean when Makeconf does not exist in the top source
+ directory.
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Thu, 29 Dec 2005 20:14:43 +0100
+
+octave-forge (2005.06.13-4) unstable; urgency=low
+
+ +++ Changes by Rafael Laboissiere
+
+ * Rebuilt to get the right dependency on libcln4 (closes: #341809)
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Sun, 4 Dec 2005 22:53:55 +0100
+
octave-forge (2005.06.13-3) unstable; urgency=low
+++ Changes by Rafael Laboissiere
@@ -646,14 +746,13 @@
-- Dirk Eddelbuettel <edd at debian.org> Sun, 25 Feb 2001 20:43:08 -0600
Local Variables:
-debian-changelog-full-name: "Debian Octave Group"
-debian-changelog-mailing-address: "pkg-octave-devel at lists.alioth.debian.org"
-eval: (add-local-hook
+eval: (add-hook
'debian-changelog-add-version-hook
(lambda ()
(save-excursion
(forward-line -1)
(beginning-of-line)
- (insert "\n NOT YET RELEASED!\n\n +++ Changes by "
- (or (getenv "DEBFULLNAME") (user-full-name)) "\n"))))
+ (insert "\n NOT YET RELEASED!\n\n [ "
+ (or (getenv "DEBFULLNAME") (user-full-name)) " ]")))
+ nil t)
End:
Modified: branches/2.9transition/packages/octave-forge/debian/control
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/control 2006-01-22 19:39:18 UTC (rev 465)
+++ branches/2.9transition/packages/octave-forge/debian/control 2006-01-23 02:28:29 UTC (rev 466)
@@ -4,7 +4,7 @@
Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
Uploaders: Rafael Laboissiere <rafael at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4), octave2.1-headers (>= 2.1.72-6), xlibs-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, dpatch
+Build-Depends: debhelper (>= 4), octave2.1-headers (>= 2.1.72-8), libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, dpatch
Build-Conflicts: octave2.0-headers, octave2.0
Package: octave-forge
Modified: branches/2.9transition/packages/octave-forge/debian/patches/00list
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/00list 2006-01-22 19:39:18 UTC (rev 465)
+++ branches/2.9transition/packages/octave-forge/debian/patches/00list 2006-01-23 02:28:29 UTC (rev 466)
@@ -0,0 +1,2 @@
+50_extra-pdb-sinclude
+50_make-pattern-rules
Added: branches/2.9transition/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch 2006-01-22 19:39:18 UTC (rev 465)
+++ branches/2.9transition/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch 2006-01-23 02:28:29 UTC (rev 466)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_extra-pdb-sinclude.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid failures for make clean
+
+ at DPATCH@
+
+--- octave-forge-2005.06.13.orig/extra/pdb/Makefile
++++ octave-forge-2005.06.13/extra/pdb/Makefile
+@@ -1,4 +1,4 @@
+-include ../../Makeconf
++sinclude ../../Makeconf
+
+ all: creadpdb.oct plotpdb.m
+
Property changes on: branches/2.9transition/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/2.9transition/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch 2006-01-22 19:39:18 UTC (rev 465)
+++ branches/2.9transition/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch 2006-01-23 02:28:29 UTC (rev 466)
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_make-pattern-rules.dpatch by <root at laboiss2.intra.mpipf-muenchen.mpg.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from octave-forge 2005.06.13-6 diff.gz
+
+ at DPATCH@
+
+--- octave-forge-2005.06.13.orig/main/comm/Makefile
++++ octave-forge-2005.06.13/main/comm/Makefile
+@@ -67,7 +67,7 @@
+ @echo "Depending $<"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
+
+-%.o:%.cc
++%.o:%.cc ; \
+ @echo "Compiling $@"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<
+
+--- octave-forge-2005.06.13.orig/main/fixed/Makefile
++++ octave-forge-2005.06.13/main/fixed/Makefile
+@@ -162,9 +162,7 @@
+ @echo "Depending $<"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
+
+-%.o:%.cc
+-%.o:%.cc %.d
+- @echo "Compiling $@"; \
++%.o:%.cc ; @echo "Compiling $@"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<
+
+ clean: $(SUBDIRS)
+--- octave-forge-2005.06.13.orig/main/fixed/examples/Makefile
++++ octave-forge-2005.06.13/main/fixed/examples/Makefile
+@@ -45,7 +45,7 @@
+ @echo "Depending $<"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -M $<
+
+-%.o: %.cc
++%.o: %.cc ; \
+ @echo "Compiling $@"; \
+ $(MKOCTFILE) $(MOFLAGS) $(DEFINES) -c $<
+
Property changes on: branches/2.9transition/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/2.9transition/packages/octave-forge/debian/rules
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/rules 2006-01-22 19:39:18 UTC (rev 465)
+++ branches/2.9transition/packages/octave-forge/debian/rules 2006-01-23 02:28:29 UTC (rev 466)
@@ -15,7 +15,7 @@
mdir := $(MDIR)
altoctdir := /usr/lib/$(altname)
altmdir := /usr/share/$(altname)
-octbin := $(shell octave-config -p LOCALARCHLIBDIR)
+octbin := $(shell octave-config-2.1.72 -p LOCALARCHLIBDIR)
mycheck:
@echo "debtmp $(debtmp)"
@@ -55,6 +55,7 @@
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
+ mv configure configure-orig
touch extra/MacOSX/NOINSTALL
[ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
CC=$(compilerpath) \
@@ -101,6 +102,7 @@
clean: unpatch
dh_testdir
dh_testroot
+ -test -f configure-orig && mv configure-orig configure
rm -f configure-stamp build-stamp install-stamp check-stamp
-test -f Makefile && $(MAKE) clean
-rm -rf *~ $(debtmp) debian/*~ debian/files* build \
@@ -148,6 +150,7 @@
dh_installdeb
# dh_perl
# call with three explicit files to cover our bases
+
octave-depends
dh_shlibdeps $(debtmp)$(octdir)/$(PACKAGE)/convhulln.oct \
$(debtmp)$(octdir)/$(PACKAGE)/jpgwrite.oct \
More information about the Pkg-octave-commit
mailing list