Package: core++
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Thanks,
Jari
>From 6d1cbde7edb4d26048fb993feb24876896ca9850 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sat, 14 Apr 2012 13:39:12 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/README.source | 7 ----
debian/changelog | 13 ++++++
debian/compat | 2 +-
debian/control | 4 +-
debian/copyright | 3 +-
debian/patches/00list | 13 ------
debian/patches/02-bugfix-filter.patch | 40 ++++++++++++++++++
...lus.dpatch => 04-bugfix-operatorplusplus.patch} | 10 ++---
...> 06-bugfix-avoid-internal-gmp-functions.patch} | 8 +---
...-size-type.dpatch => 08-bugfix-size-type.patch} | 8 +---
...le-library.dpatch => 10-makefile-library.patch} | 31 +++++++-------
...makefile-misc.dpatch => 12-makefile-misc.patch} | 8 +---
...file-output.dpatch => 14-makefile-output.patch} | 8 +---
...n-paths.dpatch => 16-documentation-paths.patch} | 8 +---
...readme.dpatch => 18-documentation-readme.patch} | 8 +---
...ility.dpatch => 20-g++-4.0-compatibility.patch} | 8 +---
...ility.dpatch => 21-g++-4.1-compatibility.patch} | 8 +---
...ility.dpatch => 22-g++-4.3-compatibility.patch} | 8 +---
...ility.dpatch => 23-g++-4.6-compatibility.patch} | 8 +---
debian/patches/bugfix-filter.dpatch | 44 --------------------
debian/patches/series | 13 ++++++
debian/rules | 20 ++++-----
debian/source/format | 2 +-
23 files changed, 118 insertions(+), 164 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/02-bugfix-filter.patch
rename debian/patches/{bugfix-operatorplusplus.dpatch => 04-bugfix-operatorplusplus.patch} (73%)
rename debian/patches/{bugfix-avoid-internal-gmp-functions.dpatch => 06-bugfix-avoid-internal-gmp-functions.patch} (85%)
rename debian/patches/{bugfix-size-type.dpatch => 08-bugfix-size-type.patch} (89%)
rename debian/patches/{makefile-library.dpatch => 10-makefile-library.patch} (77%)
rename debian/patches/{makefile-misc.dpatch => 12-makefile-misc.patch} (99%)
rename debian/patches/{makefile-output.dpatch => 14-makefile-output.patch} (97%)
rename debian/patches/{documentation-paths.dpatch => 16-documentation-paths.patch} (97%)
rename debian/patches/{documentation-readme.dpatch => 18-documentation-readme.patch} (79%)
rename debian/patches/{g++-4.0-compatibility.dpatch => 20-g++-4.0-compatibility.patch} (85%)
rename debian/patches/{g++-4.1-compatibility.dpatch => 21-g++-4.1-compatibility.patch} (63%)
rename debian/patches/{g++-4.3-compatibility.dpatch => 22-g++-4.3-compatibility.patch} (92%)
rename debian/patches/{g++-4.6-compatibility.dpatch => 23-g++-4.6-compatibility.patch} (64%)
delete mode 100644 debian/patches/bugfix-filter.dpatch
create mode 100644 debian/patches/series
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index e20d13a..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,7 +0,0 @@
-EADME.source
--------------
-
-The package uses dpatch to manage patches to the original source.
-See /usr/share/doc/dpatch/README.source.gz for details.
-
- -- Joachim Reichel <reic...@debian.org> Fri, 16 Sep 2011 18:58:36 +0200
diff --git a/debian/changelog b/debian/changelog
index 22a86b3..7cc483a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+core++ (1.7-12.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ - Add numeric prefix to all patches.
+ - Update patch 10 with "quilt refresh" to make it apply cleanly.
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Use dh_prep in rules file.
+ * Fix duplicate-in-relation-field (Lintian).
+ * Fix copyright-refers-to-deprecated-bsd-license-file (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 14 Apr 2012 13:38:17 +0300
+
core++ (1.7-12) unstable; urgency=low
* Add patch g++-4.6-compatibility.dpatch (Closes: #633578, thanks to
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 41b6b1c..68a0c27 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: core++
Section: non-free/math
Priority: optional
Maintainer: Joachim Reichel <reic...@debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libgmp-dev, texlive-latex-base, texlive-latex-base, gawk | awk, ghostscript
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), libgmp-dev, texlive-latex-base, gawk | awk, ghostscript
+Standards-Version: 3.9.3
Homepage: http://www.cs.nyu.edu/exact/core_pages/intro.html
XS-Autobuild: yes
diff --git a/debian/copyright b/debian/copyright
index 82904e1..24598cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,8 +22,7 @@ The Debian packaging:
Copyright (c) 2004, 2005, 2006, 2011 Joachim Reichel <reic...@debian.org>
-and is licensed under the BSD license,
-see "/usr/share/common-licenses/BSD".
+and is licensed under the BSD license.
The package is not in main, but in non-free since parts of it are licensed
under the QPL. This license is not DFSG-free, but it permits one to autobuild
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 16fb59e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,13 +0,0 @@
-bugfix-filter.dpatch
-bugfix-operatorplusplus.dpatch
-bugfix-avoid-internal-gmp-functions.dpatch
-bugfix-size-type.dpatch
-makefile-library.dpatch
-makefile-misc.dpatch
-makefile-output.dpatch
-documentation-paths.dpatch
-documentation-readme.dpatch
-g++-4.0-compatibility.dpatch
-g++-4.1-compatibility.dpatch
-g++-4.3-compatibility.dpatch
-g++-4.6-compatibility.dpatch
diff --git a/debian/patches/02-bugfix-filter.patch b/debian/patches/02-bugfix-filter.patch
new file mode 100644
index 0000000..f4b1a9b
--- /dev/null
+++ b/debian/patches/02-bugfix-filter.patch
@@ -0,0 +1,40 @@
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: The patch fixes a problem exposed by the following piece of code:
+
+#include "CORE/Expr.h"
+
+int main (int argc, char* argv[])
+{
+CORE::BigRat large ("22056730828276574458547175013883216467476872755086964295193460720021853755465629072269258954121163731475631714119099840347497961090538262328734056966733720709815412125069165956247150829255095890113693179945329398691563060211289184266247766729226258574306693936046940295499433823219204319239906902222024366393841401155626607535624231276347490007095991669259288994417285636787983003769503223726502372783693309954766065876799926762287172711748917912232935178660587316551968245210589455313071167076401493075299837356515655888411082309335826494442934347285376887664307211239365443306044183662876478985244212735844924974989150199069307003280200060111499569786382285977364825392318326851159432635346367151290291631531554913751724893460469069547208946955224265325392885399798126657208221180788778400324907150233302791588009276803009797028184220618992783121977857908976266677561242802415919690200544114295109720535221099297209448522061332432197124484207428635197981586216597681588717101511557253786343834032638045890884717389911401000590189782799474466040733722126091652892707223954277743304836036311008667705531056276150658576893318688109218369131172944113814569041058017252601228351626529536894545671431774164326784454508884394355149284154441884153238020072100248384069127883977817374317881721365157547731991130497340067027095158450768002152789673852171185697375893915055282375021710680972671037261939809348959898244034519810739833260745241274632367144064250505129889920830125711206378536009811130822431321822223006689430061821350208089344103560621893694553717767618669117454686718040075832411848289616082068565327605459820927971564224635272839395488625653689443250779901268746633776694188674413434194729654493929833283912621040736895959147326292521899914111877902178492154547202941117349222179613641054322697542774178737769632217397181032969294874757392502243456256079712050558596812288058246727669016499639023706941884747862412582052641835266418284885728964319815812258779086499090061763081207521408713543051054202030839930630401951233176791299227117356324258433064969253290770713624926626235861939377682590602658977681375515775284293988813502174038878847682159558119588666364539632642349084495252373743605298522860136713999547072522111189366203938081292843");
+CORE::Expr expr (CORE::BigRat(1) / large);
+double lb, ub;
+expr.doubleInterval (lb, ub);
+assert (lb == 0);
+assert (ub > 0);
+return 0;
+}
+
+diff -urNad core++-1.7.orig/inc/CORE/Filter.h core++-1.7/inc/CORE/Filter.h
+--- core++-1.7.orig/inc/CORE/Filter.h 2005-08-27 12:32:14.156723880 +0200
++++ core++-1.7/inc/CORE/Filter.h 2005-08-27 12:32:41.016640552 +0200
+@@ -80,7 +80,10 @@
+ if (value != CORE_REAL_ZERO) {
+ ind = 1;
+ fpVal = value.doubleValue();
+- maxAbs = core_abs(fpVal); // NaN are propagated correctly by core_abs.
++ if (value.MSB() <= -1075)
++ maxAbs = 1;
++ else
++ maxAbs = core_abs(fpVal); // NaN are propagated correctly by core_abs.
+ }
+ }
+ //@}
+@@ -91,7 +94,7 @@
+ double getValue() const {
+ return fpVal;
+ }
+- /// check whether filtered value is OK
++ /// check whether the sign (!) of the filtered value is OK
+ bool isOK() const {
+ return (fpFilterFlag && // To disable filter
+ finite(fpVal) && // Test for infinite and NaNs
diff --git a/debian/patches/bugfix-operatorplusplus.dpatch b/debian/patches/04-bugfix-operatorplusplus.patch
similarity index 73%
rename from debian/patches/bugfix-operatorplusplus.dpatch
rename to debian/patches/04-bugfix-operatorplusplus.patch
index 6a4be21..69dfaca 100644
--- a/debian/patches/bugfix-operatorplusplus.dpatch
+++ b/debian/patches/04-bugfix-operatorplusplus.patch
@@ -1,11 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bugfix-operatorplusplus.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The patch fixes the functions Big{Int,Rat}::operator{++,--}.
-## DP: The prefix versions work fine, but the postfix versions crash the program.
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: The patch fixes the functions Big{Int,Rat}::operator{++,--}.
+ The prefix versions work fine, but the postfix versions crash the program.
-@DPATCH@
diff -urNad core++-1.7/inc/CORE/BigInt.h /tmp/dpep.MS39vc/core++-1.7/inc/CORE/BigInt.h
--- core++-1.7.orig/inc/CORE/BigInt.h 2005-09-13 18:42:47.029475231 +0200
+++ core++-1.7/inc/CORE/BigInt.h 2005-09-13 18:35:40.861187736 +0200
diff --git a/debian/patches/bugfix-avoid-internal-gmp-functions.dpatch b/debian/patches/06-bugfix-avoid-internal-gmp-functions.patch
similarity index 85%
rename from debian/patches/bugfix-avoid-internal-gmp-functions.dpatch
rename to debian/patches/06-bugfix-avoid-internal-gmp-functions.patch
index 3525bbd..1df77b3 100644
--- a/debian/patches/bugfix-avoid-internal-gmp-functions.dpatch
+++ b/debian/patches/06-bugfix-avoid-internal-gmp-functions.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bugfix-avoid-internal-gmp-functions.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid calling internal GMP functions like __gmp_free_func.
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: Avoid calling internal GMP functions like __gmp_free_func.
-@DPATCH@
diff -urNad core++-1.7~/inc/CORE/BigInt.h core++-1.7/inc/CORE/BigInt.h
--- core++-1.7~/inc/CORE/BigInt.h 2006-04-18 00:05:42.000000000 +0200
+++ core++-1.7/inc/CORE/BigInt.h 2006-04-18 00:05:57.000000000 +0200
diff --git a/debian/patches/bugfix-size-type.dpatch b/debian/patches/08-bugfix-size-type.patch
similarity index 89%
rename from debian/patches/bugfix-size-type.dpatch
rename to debian/patches/08-bugfix-size-type.patch
index 3b2541c..8a65ba7 100644
--- a/debian/patches/bugfix-size-type.dpatch
+++ b/debian/patches/08-bugfix-size-type.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bugfix_size_type.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix warning "comparison is always true due to limited range of data type"
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: Fix warning "comparison is always true due to limited range of data type"
-@DPATCH@
diff -urNad core++-1.7~/inc/CORE/poly/Curves.tcc core++-1.7/inc/CORE/poly/Curves.tcc
--- core++-1.7~/inc/CORE/poly/Curves.tcc 2004-11-05 22:41:42.000000000 +0100
+++ core++-1.7/inc/CORE/poly/Curves.tcc 2008-02-18 21:47:42.000000000 +0100
diff --git a/debian/patches/makefile-library.dpatch b/debian/patches/10-makefile-library.patch
similarity index 77%
rename from debian/patches/makefile-library.dpatch
rename to debian/patches/10-makefile-library.patch
index 65a0ebf..dd97a96 100644
--- a/debian/patches/makefile-library.dpatch
+++ b/debian/patches/10-makefile-library.patch
@@ -1,14 +1,15 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile-library.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: - fix filename and soname for shared libaries
-## DP: - link extension libraries with basic library
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: Fix filename and soname for shared libaries and
+ link extension libraries with basic library
-@DPATCH@
-diff -urNad core++-1.7~/ext/Makefile core++-1.7/ext/Makefile
---- core++-1.7~/ext/Makefile 2008-02-18 22:14:08.000000000 +0100
-+++ core++-1.7/ext/Makefile 2008-02-18 22:16:08.000000000 +0100
+---
+ ext/Makefile | 18 +++++++++---------
+ lib/Makefile | 2 +-
+ src/Makefile | 6 +++---
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+--- a/ext/Makefile
++++ b/ext/Makefile
@@ -29,9 +29,9 @@
COREX_LIB_LEVEL3=${CORE_PATH}/lib/libcorex++$(VAR)_level3.a
COREX_LIB_LEVEL2=${CORE_PATH}/lib/libcorex++$(VAR)_level2.a
@@ -61,9 +62,8 @@ diff -urNad core++-1.7~/ext/Makefile core++-1.7/ext/Makefile
clean:
-@test -z "*.o" || rm -f *.o
-diff -urNad core++-1.7~/lib/Makefile core++-1.7/lib/Makefile
---- core++-1.7~/lib/Makefile 2008-02-18 22:14:08.000000000 +0100
-+++ core++-1.7/lib/Makefile 2008-02-18 22:14:09.000000000 +0100
+--- a/lib/Makefile
++++ b/lib/Makefile
@@ -9,7 +9,7 @@
CORE_PATH=..
@@ -73,9 +73,8 @@ diff -urNad core++-1.7~/lib/Makefile core++-1.7/lib/Makefile
veryclean: clean
-diff -urNad core++-1.7~/src/Makefile core++-1.7/src/Makefile
---- core++-1.7~/src/Makefile 2008-02-18 22:14:08.000000000 +0100
-+++ core++-1.7/src/Makefile 2008-02-18 22:14:09.000000000 +0100
+--- a/src/Makefile
++++ b/src/Makefile
@@ -31,7 +31,7 @@
# The following library will be built:
diff --git a/debian/patches/makefile-misc.dpatch b/debian/patches/12-makefile-misc.patch
similarity index 99%
rename from debian/patches/makefile-misc.dpatch
rename to debian/patches/12-makefile-misc.patch
index 925d030..e3e9d8a 100644
--- a/debian/patches/makefile-misc.dpatch
+++ b/debian/patches/12-makefile-misc.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile-misc.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: misc fixes for the build process
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: misc fixes for the build process
-@DPATCH@
diff -urNad core++-1.7/Make.config core++-1.7~/Make.config
--- core++-1.7/Make.config Thu Nov 25 00:05:53 2004
+++ core++-1.7~/Make.config Thu Nov 25 00:05:54 2004
diff --git a/debian/patches/makefile-output.dpatch b/debian/patches/14-makefile-output.patch
similarity index 97%
rename from debian/patches/makefile-output.dpatch
rename to debian/patches/14-makefile-output.patch
index bb17083..f8a7f70 100644
--- a/debian/patches/makefile-output.dpatch
+++ b/debian/patches/14-makefile-output.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefile-output.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: do not suppress output of make (echo of commands executed)
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: do not suppress output of make (echo of commands executed)
-@DPATCH@
diff -urNad core++-1.7/Makefile core++-1.7/Makefile
--- core++-1.7/Makefile Thu Nov 11 23:03:34 2004
+++ core++-1.7/Makefile Thu Nov 11 23:03:35 2004
diff --git a/debian/patches/documentation-paths.dpatch b/debian/patches/16-documentation-paths.patch
similarity index 97%
rename from debian/patches/documentation-paths.dpatch
rename to debian/patches/16-documentation-paths.patch
index 910dc31..6c1459f 100644
--- a/debian/patches/documentation-paths.dpatch
+++ b/debian/patches/16-documentation-paths.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## documentation-paths.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: update paths in demos and documentation
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: update paths in demos and documentation
-@DPATCH@
diff -urNad core++-1.7/progs/Makefile core++-1.7/progs/Makefile
--- core++-1.7/progs/Makefile Tue Nov 16 22:05:54 2004
+++ core++-1.7/progs/Makefile Tue Nov 16 22:05:56 2004
diff --git a/debian/patches/documentation-readme.dpatch b/debian/patches/18-documentation-readme.patch
similarity index 79%
rename from debian/patches/documentation-readme.dpatch
rename to debian/patches/18-documentation-readme.patch
index 14d3529..cfb65da 100644
--- a/debian/patches/documentation-readme.dpatch
+++ b/debian/patches/18-documentation-readme.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## documentation-readme.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix README w.r.t. the /usr/share/doc/libcore++-demo directory layout
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: fix README w.r.t. the /usr/share/doc/libcore++-demo directory layout
-@DPATCH@
diff -urNad core++-1.7/doc/README core++-1.7/doc/README
--- core++-1.7/doc/README Thu Aug 12 23:16:29 2004
+++ core++-1.7/doc/README Tue Aug 24 22:24:48 2004
diff --git a/debian/patches/g++-4.0-compatibility.dpatch b/debian/patches/20-g++-4.0-compatibility.patch
similarity index 85%
rename from debian/patches/g++-4.0-compatibility.dpatch
rename to debian/patches/20-g++-4.0-compatibility.patch
index 73f11e4..c49beee 100644
--- a/debian/patches/g++-4.0-compatibility.dpatch
+++ b/debian/patches/20-g++-4.0-compatibility.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## g++-4.0-compatibility.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: some fixes required for compatibility with g++ 4.0
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: some fixes required for compatibility with g++ 4.0
-@DPATCH@
diff -urNad core++-1.7.orig/inc/CORE/geombase.h core++-1.7/inc/CORE/geombase.h
--- core++-1.7.orig/inc/CORE/geombase.h
+++ core++-1.7/inc/CORE/geombase.h
diff --git a/debian/patches/g++-4.1-compatibility.dpatch b/debian/patches/21-g++-4.1-compatibility.patch
similarity index 63%
rename from debian/patches/g++-4.1-compatibility.dpatch
rename to debian/patches/21-g++-4.1-compatibility.patch
index 67d879a..13deba7 100644
--- a/debian/patches/g++-4.1-compatibility.dpatch
+++ b/debian/patches/21-g++-4.1-compatibility.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## g++-4.1-compatibility.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: some fixes required for compatibility with g++ 4.1
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: some fixes required for compatibility with g++ 4.1
-@DPATCH@
diff -urNad core++-1.7~/inc/CORE/linearAlgebra.h core++-1.7/inc/CORE/linearAlgebra.h
--- core++-1.7~/inc/CORE/linearAlgebra.h 2006-06-19 20:25:54.000000000 +0200
+++ core++-1.7/inc/CORE/linearAlgebra.h 2006-06-19 20:27:03.000000000 +0200
diff --git a/debian/patches/g++-4.3-compatibility.dpatch b/debian/patches/22-g++-4.3-compatibility.patch
similarity index 92%
rename from debian/patches/g++-4.3-compatibility.dpatch
rename to debian/patches/22-g++-4.3-compatibility.patch
index 3eb4385..25a8360 100644
--- a/debian/patches/g++-4.3-compatibility.dpatch
+++ b/debian/patches/22-g++-4.3-compatibility.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## g++-4.3-compatibility.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: some fixes required for compatibility with g++ 4.3
+From: Joachim Reichel <joachim.reic...@gmx.de>
+Subject: some fixes required for compatibility with g++ 4.3
-@DPATCH@
diff -urNad core++-1.7~/ext/geom3d/triangle3d.cpp core++-1.7/ext/geom3d/triangle3d.cpp
--- core++-1.7~/ext/geom3d/triangle3d.cpp 2008-06-27 12:09:58.000000000 +0200
+++ core++-1.7/ext/geom3d/triangle3d.cpp 2008-06-27 12:09:59.000000000 +0200
diff --git a/debian/patches/g++-4.6-compatibility.dpatch b/debian/patches/23-g++-4.6-compatibility.patch
similarity index 64%
rename from debian/patches/g++-4.6-compatibility.dpatch
rename to debian/patches/23-g++-4.6-compatibility.patch
index 98fba14..ffdabe6 100644
--- a/debian/patches/g++-4.6-compatibility.dpatch
+++ b/debian/patches/23-g++-4.6-compatibility.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## g++-4.6-compatibility.dpatch by Stephen M. Webb <stephen.w...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: some fixes required for compatibility with g++ 4.6
+From: Stephen M. Webb <stephen.w...@ubuntu.com>
+Subject: some fixes required for compatibility with g++ 4.6
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' core++~/inc/CORE/MemoryPool.h core++/inc/CORE/MemoryPool.h
--- core++~/inc/CORE/MemoryPool.h 2011-09-12 11:59:25.000000000 -0400
+++ core++/inc/CORE/MemoryPool.h 2011-09-12 12:00:14.473521756 -0400
diff --git a/debian/patches/bugfix-filter.dpatch b/debian/patches/bugfix-filter.dpatch
deleted file mode 100644
index 4d91862..0000000
--- a/debian/patches/bugfix-filter.dpatch
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bugfix-filter.dpatch by Joachim Reichel <joachim.reic...@gmx.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The patch fixes a problem exposed by the following piece of code:
-## DP:
-## DP: #include "CORE/Expr.h"
-## DP:
-## DP: int main (int argc, char* argv[])
-## DP: {
-## DP: CORE::BigRat large ("22056730828276574458547175013883216467476872755086964295193460720021853755465629072269258954121163731475631714119099840347497961090538262328734056966733720709815412125069165956247150829255095890113693179945329398691563060211289184266247766729226258574306693936046940295499433823219204319239906902222024366393841401155626607535624231276347490007095991669259288994417285636787983003769503223726502372783693309954766065876799926762287172711748917912232935178660587316551968245210589455313071167076401493075299837356515655888411082309335826494442934347285376887664307211239365443306044183662876478985244212735844924974989150199069307003280200060111499569786382285977364825392318326851159432635346367151290291631531554913751724893460469069547208946955224265325392885399798126657208221180788778400324907150233302791588009276803009797028184220618992783121977857908976266677561242802415919690200544114295109720535221099297209448522061332432197124484207428635197981586216597681588717101511557253786343834032638045890884717389911401000590189782799474466040733722126091652892707223954277743304836036311008667705531056276150658576893318688109218369131172944113814569041058017252601228351626529536894545671431774164326784454508884394355149284154441884153238020072100248384069127883977817374317881721365157547731991130497340067027095158450768002152789673852171185697375893915055282375021710680972671037261939809348959898244034519810739833260745241274632367144064250505129889920830125711206378536009811130822431321822223006689430061821350208089344103560621893694553717767618669117454686718040075832411848289616082068565327605459820927971564224635272839395488625653689443250779901268746633776694188674413434194729654493929833283912621040736895959147326292521899914111877902178492154547202941117349222179613641054322697542774178737769632217397181032969294874757392502243456256079712050558596812288058246727669016499639023706941884747862412582052641835266418284885728964319815812258779086499090061763081207521408713543051054202030839930630401951233176791299227117356324258433064969253290770713624926626235861939377682590602658977681375515775284293988813502174038878847682159558119588666364539632642349084495252373743605298522860136713999547072522111189366203938081292843");
-## DP: CORE::Expr expr (CORE::BigRat(1) / large);
-## DP: double lb, ub;
-## DP: expr.doubleInterval (lb, ub);
-## DP: assert (lb == 0);
-## DP: assert (ub > 0);
-## DP: return 0;
-## DP: }
-
-@DPATCH@
-diff -urNad core++-1.7.orig/inc/CORE/Filter.h core++-1.7/inc/CORE/Filter.h
---- core++-1.7.orig/inc/CORE/Filter.h 2005-08-27 12:32:14.156723880 +0200
-+++ core++-1.7/inc/CORE/Filter.h 2005-08-27 12:32:41.016640552 +0200
-@@ -80,7 +80,10 @@
- if (value != CORE_REAL_ZERO) {
- ind = 1;
- fpVal = value.doubleValue();
-- maxAbs = core_abs(fpVal); // NaN are propagated correctly by core_abs.
-+ if (value.MSB() <= -1075)
-+ maxAbs = 1;
-+ else
-+ maxAbs = core_abs(fpVal); // NaN are propagated correctly by core_abs.
- }
- }
- //@}
-@@ -91,7 +94,7 @@
- double getValue() const {
- return fpVal;
- }
-- /// check whether filtered value is OK
-+ /// check whether the sign (!) of the filtered value is OK
- bool isOK() const {
- return (fpFilterFlag && // To disable filter
- finite(fpVal) && // Test for infinite and NaNs
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..127c0e2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,13 @@
+02-bugfix-filter.patch
+04-bugfix-operatorplusplus.patch
+06-bugfix-avoid-internal-gmp-functions.patch
+08-bugfix-size-type.patch
+10-makefile-library.patch
+12-makefile-misc.patch
+14-makefile-output.patch
+16-documentation-paths.patch
+18-documentation-readme.patch
+20-g++-4.0-compatibility.patch
+21-g++-4.1-compatibility.patch
+22-g++-4.3-compatibility.patch
+23-g++-4.6-compatibility.patch
diff --git a/debian/rules b/debian/rules
index a2e3dd0..de9d79d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ SOVERSION=1.0.0
SOMAJOR=1
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
# Add here commands to configure the package.
touch configure-stamp
@@ -52,8 +52,8 @@ build-indep-stamp:
build: build-arch build-indep
-clean: clean-patched unpatch
-clean-patched: patch
+clean: clean-patched
+clean-patched:
dh_testdir
dh_testroot
rm -f build-indep-stamp build-arch-stamp configure-stamp
@@ -67,7 +67,7 @@ clean-patched: patch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tmp
@@ -141,13 +141,11 @@ binary-arch: build install
binary: binary-indep binary-arch
-patch: patch-stamp
-patch-stamp:
- dpatch apply-all
- touch patch-stamp
+patch:
+:
+ touch
unpatch:
- dpatch deapply-all
- rm -fr patch-stamp debian/patched
+ rm -fr debian/patched
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
1.7.9.5
