[Pkg-octave-commit] rev 62 - in trunk/packages/semidef-oct/debian: . patches
Rafael Laboissiere
rafael@costa.debian.org
Sun, 13 Feb 2005 22:37:30 +0100
Author: rafael
Date: 2005-02-13 22:37:30 +0100 (Sun, 13 Feb 2005)
New Revision: 62
Added:
trunk/packages/semidef-oct/debian/patches/
trunk/packages/semidef-oct/debian/patches/00list
trunk/packages/semidef-oct/debian/patches/50_src-makefile.dpatch
trunk/packages/semidef-oct/debian/patches/50_strstream-namespace-std.dpatch
Removed:
trunk/packages/semidef-oct/debian/Makefile
trunk/packages/semidef-oct/debian/patch_g++-3.0
trunk/packages/semidef-oct/debian/patch_g++-3.3
Modified:
trunk/packages/semidef-oct/debian/changelog
trunk/packages/semidef-oct/debian/control
trunk/packages/semidef-oct/debian/rules
Log:
Debian release semidef-oct_2003-1
Deleted: trunk/packages/semidef-oct/debian/Makefile
Modified: trunk/packages/semidef-oct/debian/changelog
===================================================================
--- trunk/packages/semidef-oct/debian/changelog 2005-02-13 19:32:57 UTC (rev 61)
+++ trunk/packages/semidef-oct/debian/changelog 2005-02-13 21:37:30 UTC (rev 62)
@@ -1,3 +1,22 @@
+semidef-oct (1:2003-1) unstable; urgency=low
+
+ +++ Changes by Rafael Laboissiere
+
+ * New upstream release
+ * debian/changelog: Added (X)Emacs variables for debian-changelog-mode
+ * debian/control:
+ - Set maintainer to Debian Octave Group
+ - Build-Depends on dpatch
+ * debian/rules:
+ - Use SRC/Makefile instead of debian/Makefile
+ - Adjust for dpatch usage
+ * debian/Makefile, debian/patch_g++-3.0, debian/patch_g++-3.3: Removed
+ obsolete files
+ * 50_strstream-namespace-std.dpatch, 50_src-makefile.dpatch: Added
+ patches.
+
+ -- Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org> Sun, 13 Feb 2005 21:38:15 +0100
+
semidef-oct (1:2.2-23) unstable; urgency=low
* Rebuilt with octave 2.1.64
@@ -7,7 +26,7 @@
semidef-oct (1:2.2-22) unstable; urgency=low
- * Rebuilt with octave 2.1.63
+ * Rebuilt with octave 2.1.63
* debian/control: Build-Depends and Depends updated accordingly
* debian/control: Added Rafael as Uploaders:
@@ -44,13 +63,13 @@
semidef-oct (1:2.2-17) unstable; urgency=low
- * Rebuilt with Octave 2.1.58
+ * Rebuilt with Octave 2.1.58
* debian/control: Updated Build-Depends to octave2.1-headers (>= 2.1.58)
* debian/control: Adopted the tighter Depends: line we use for octave-forge
- and which is inspired by what the Python packages do:
+ and which is inspired by what the Python packages do:
Depends: octave2.1 (>= 2.1.58), octave2.1 (<< 2.1.59
So as long as an upgrade breaks the package, we prevent the upgrade.
-
+
-- Dirk Eddelbuettel <edd@debian.org> Sun, 5 Sep 2004 13:39:36 -0500
semidef-oct (1:2.2-16) unstable; urgency=low
@@ -77,7 +96,7 @@
semidef-oct (1:2.2-13) unstable; urgency=low
* Applied patch by John Eaton to enable use of g++-3.3 (Closes: #199230)
- * Rebuilt using octave 2.1.50
+ * Rebuilt using octave 2.1.50
-- Dirk Eddelbuettel <edd@debian.org> Tue, 1 Jul 2003 20:18:57 -0500
@@ -169,7 +188,7 @@
* Applied patch by James Troup to compile under g++-3.0 (Closes: #120514)
* debian/control: Added g++, g++-3.0 to Build-Depends
-
+
-- Dirk Eddelbuettel <edd@debian.org> Wed, 21 Nov 2001 21:56:57 -0600
semidef-oct (2000.01.24-2) unstable; urgency=low
@@ -191,7 +210,7 @@
semidef-oct (1998.09-4) unstable; urgency=low
* debian/rules: Adapted to use /usr/share/ following the recommendation
- on FHS transition from the Technical Committee
+ on FHS transition from the Technical Committee
* debian/rules: Test for debhelper >= 2.0.40 for FHS compliance
* debian/control: Upgraded to Debian Policy 3.0.1
@@ -216,11 +235,12 @@
* (SRC/sp.cc) Added #if defined(__linux__) to include sys/resource.h
* (SRC/sp.cc) Added '|| defined(__linux__) to two #if define statements
* (prompt.m, run_cmd.m) Added from the OCST sources by A.S. Hodel
- * (SRC/Makefile) Changed to link against Octave's libcruft which
+ * (SRC/Makefile) Changed to link against Octave's libcruft which
contains three of the provided sourcefiles
-
+
-- Dirk Eddelbuettel <edd@debian.org> Sun, 4 Oct 1998 17:05:55 -0400
-
-
-
+Local Variables:
+debian-changelog-full-name: "Debian Octave Group"
+debian-changelog-mailing-address: "pkg-octave-devel@lists.alioth.debian.org"
+End:
Modified: trunk/packages/semidef-oct/debian/control
===================================================================
--- trunk/packages/semidef-oct/debian/control 2005-02-13 19:32:57 UTC (rev 61)
+++ trunk/packages/semidef-oct/debian/control 2005-02-13 21:37:30 UTC (rev 62)
@@ -1,16 +1,15 @@
Source: semidef-oct
Section: math
Priority: optional
-Maintainer: Dirk Eddelbuettel <edd@debian.org>
-Uploaders: Rafael Laboissiere <rafael@debian.org>
+Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
Standards-Version: 3.6.1.1
-Build-Depends: octave2.1-headers (>= 2.1.64), g77 [!m68k], fort77 [m68k], debhelper (>= 3.0.0)
+Build-Depends: octave2.1-headers (>= 2.1.64), g77 [!m68k], fort77 [m68k], debhelper (>= 3.0.0), dpatch
Build-Conflicts: octave2.0-headers
Package: octave-sp
Architecture: any
Depends: octave2.1 (>= 2.1.64), octave2.1 (<< 2.1.65), ${shlibs:Depends}
-Description: Semidefinite Programming functions for GNU Octave
+Description: Semidefinite Programming functions for GNU Octave
The octave-sp package provides functions for semidefinite programming. It
- can be used to solve nonlinear, convex optimization problems. For an
+ can be used to solve nonlinear, convex optimization problems. For an
overview of the functionality, use 'demosp' from within Octave.
Deleted: trunk/packages/semidef-oct/debian/patch_g++-3.0
Deleted: trunk/packages/semidef-oct/debian/patch_g++-3.3
Added: trunk/packages/semidef-oct/debian/patches/00list
===================================================================
--- trunk/packages/semidef-oct/debian/patches/00list 2005-02-13 19:32:57 UTC (rev 61)
+++ trunk/packages/semidef-oct/debian/patches/00list 2005-02-13 21:37:30 UTC (rev 62)
@@ -0,0 +1,2 @@
+50_strstream-namespace-std
+50_src-makefile
Added: trunk/packages/semidef-oct/debian/patches/50_src-makefile.dpatch
===================================================================
--- trunk/packages/semidef-oct/debian/patches/50_src-makefile.dpatch 2005-02-13 19:32:57 UTC (rev 61)
+++ trunk/packages/semidef-oct/debian/patches/50_src-makefile.dpatch 2005-02-13 21:37:30 UTC (rev 62)
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_src-makefile.dpatch by Rafael Labossiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 1) Add CXXFLAGS=-Wno-deprecated flag to all calls of mkoctfile
+## DP: 2) Add -Duserusage when generating sp.oct, to avoid problems with
+## DP: undefined CLK_TCK
+## DP: 3) Removed some objects from the SP_DEP list which are already in
+## DP: Octave's libcruftoriginal set
+
+@DPATCH@
+
+--- semidef-oct-2003.orig/SRC/Makefile
++++ semidef-oct-2003/SRC/Makefile
+@@ -1,24 +1,32 @@
+ %.oct : %.cc $(OCT_LIBS) ocst.h
+ @echo "making $@ from $<"
+- mkoctfile $< -locst -lm
++ CXXFLAGS=-Wno-deprecated mkoctfile $< -locst -lm
+
+ %.o : %.cc ocst.h
+ @echo "making $@ from $<"
+- mkoctfile $<
++ CXXFLAGS=-Wno-deprecated mkoctfile $<
+ rm -f $*.oct
+
+-OCT_FILES = sp.oct
++OCT_FILES = sp.oct
+
+ all: $(OCT_FILES)
+
++# original set
++#SP_DEP= sp.cc get_matrix.o get_real_scalar.o get_vector.o sp_src.c \
++# dgels.f dopgtr.f dspgv.f dsptrd.f dtrsv.f lse.f \
++# dlansp.f dpptrf.f dspmv.f dtpmv.f lce.f xerbla.f \
++# dlantr.f dspev.f dspr.f dtpsv.f lde.f \
++# dlatrs.f dspgst.f dspr2.f dtrcon.f lsame.f
++
++# pruned by three files found in Octave's libcruftoriginal set
+ SP_DEP= sp.cc get_matrix.o get_real_scalar.o get_vector.o sp_src.c \
+- dgels.f dopgtr.f dspgv.f dsptrd.f dtrsv.f lse.f \
+- dlansp.f dpptrf.f dspmv.f dtpmv.f lce.f xerbla.f \
++ dgels.f dopgtr.f dspgv.f dsptrd.f lse.f \
++ dlansp.f dpptrf.f dspmv.f dtpmv.f lce.f \
+ dlantr.f dspev.f dspr.f dtpsv.f lde.f \
+- dlatrs.f dspgst.f dspr2.f dtrcon.f lsame.f
++ dlatrs.f dspgst.f dspr2.f dtrcon.f
+
+ sp.oct: $(SP_DEP)
+- mkoctfile $(SP_DEP)
++ CXXFLAGS=-Wno-deprecated mkoctfile -Duserusage $(SP_DEP)
+
+ clean:
+ rm -f *.o *.oct *.a *.so *.so.1 core octave-core
Property changes on: trunk/packages/semidef-oct/debian/patches/50_src-makefile.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/semidef-oct/debian/patches/50_strstream-namespace-std.dpatch
===================================================================
--- trunk/packages/semidef-oct/debian/patches/50_strstream-namespace-std.dpatch 2005-02-13 19:32:57 UTC (rev 61)
+++ trunk/packages/semidef-oct/debian/patches/50_strstream-namespace-std.dpatch 2005-02-13 21:37:30 UTC (rev 62)
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_strstream-namespace-std.dpatch by Rafael Labossiere <rafael@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: 1) Include <strstream> instead of <strstream.h>, since the later is
+## DP: not found by g++ v3.3.5
+## DP: 2) Use ostrstream in std namespace
+
+@DPATCH@
+
+--- semidef-oct-2003.orig/SRC/get_matrix.cc
++++ semidef-oct-2003/SRC/get_matrix.cc
+@@ -17,7 +17,7 @@
+ if( !( arg.is_numeric_type()
+ && (arg.is_matrix_type() || arg.is_scalar_type ())) )
+ {
+- ostrstream errmesg;
++ std::ostrstream errmesg;
+ errmesg << caller << "expecting real matrix for argument"
+ << argnum << ends;
+ error(errmesg.str());
+--- semidef-oct-2003.orig/SRC/get_real_scalar.cc
++++ semidef-oct-2003/SRC/get_real_scalar.cc
+@@ -11,7 +11,7 @@
+ int argnum, int signflg, int& errflg)
+ {
+ double retval = 0;
+- ostrstream errmesg;
++ std::ostrstream errmesg;
+
+ if ( !( arg.is_real_type() && arg.is_scalar_type() ) )
+ {
+--- semidef-oct-2003.orig/SRC/get_vector.cc
++++ semidef-oct-2003/SRC/get_vector.cc
+@@ -15,7 +15,7 @@
+ << argnum << ", errflg=" << errflg << endl;
+ #endif
+ ColumnVector retval(0);
+- ostrstream errmesg;
++ std::ostrstream errmesg;
+
+ if(arg.is_empty() )
+ return retval;
+--- semidef-oct-2003.orig/SRC/ocst.h
++++ semidef-oct-2003/SRC/ocst.h
+@@ -8,7 +8,7 @@
+ #include <iostream.h>
+ #include <math.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ #include <utils.h>
+
+ #include <octave/defun-dld.h>
+--- semidef-oct-2003.orig/SRC/sp.cc
++++ semidef-oct-2003/SRC/sp.cc
+@@ -10,7 +10,7 @@
+ #include <iostream.h>
+ #include <math.h>
+ #include <string.h>
+-#include <strstream.h>
++#include <strstream>
+ #include <utils.h>
+
+ #include <octave/defun-dld.h>
+@@ -417,7 +417,7 @@
+ }
+
+ // information string output
+- ostrstream infostr;
++ std::ostrstream infostr;
+ switch (info)
+ {
+ case 1:
Property changes on: trunk/packages/semidef-oct/debian/patches/50_strstream-namespace-std.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/semidef-oct/debian/rules
===================================================================
--- trunk/packages/semidef-oct/debian/rules 2005-02-13 19:32:57 UTC (rev 61)
+++ trunk/packages/semidef-oct/debian/rules 2005-02-13 21:37:30 UTC (rev 62)
@@ -3,7 +3,9 @@
# debian/rules file for the Debian/GNU Linux octave-sp package
# Copyright (C) 1998 - 2003 by Dirk Eddelbuettel <edd@debian.org>
-package := $(shell grep Package debian/control | sed 's/^Package: //')
+include /usr/share/dpatch/dpatch.make
+
+PACKAGE := $(shell grep Package debian/control | sed 's/^Package: //')
debtmp := $(CURDIR)/debian/tmp
deboct := $(shell octave-config --oct-site-dir)
@@ -12,16 +14,16 @@
lynx ftp://ftp.eng.auburn.edu/pub/hodel
build: build-stamp
-build-stamp:
+build-stamp: patch-stamp
dh_testdir
- cd SRC; $(MAKE) -f ../debian/Makefile sp.oct
+ cd SRC; $(MAKE) sp.oct
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
- cd SRC; $(MAKE) -i -f ../debian/Makefile clean
- dh_clean build-stamp $(package)
+ cd SRC; $(MAKE) -i clean
+ dh_clean build-stamp $(PACKAGE)
binary-indep: build