[ppl] 65/68: Imported Debian patch 1:1.1-7
Andreas Tille
tille at debian.org
Sat Nov 12 08:42:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository ppl.
commit b38fb32aa5d261c0235cbfd8a353792f929e17f6
Author: Michael Tautschnig <mt at debian.org>
Date: Mon Sep 21 12:27:25 2015 +0100
Imported Debian patch 1:1.1-7
---
debian/changelog | 9 ++++
debian/control | 10 +++--
debian/libppl-c4.links | 2 +-
debian/libppl-swi.links | 2 +-
debian/{libppl13.dirs => libppl13v5.dirs} | 0
debian/{libppl13.docs => libppl13v5.docs} | 0
debian/{libppl13.install => libppl13v5.install} | 0
debian/patches/reproducible_builds_gzip_n | 60 +++++++++++++++++++++++++
debian/patches/series | 1 +
9 files changed, 78 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a58fedb..fd0f811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ppl (1:1.1-7) unstable; urgency=medium
+
+ * Rename C++ library package for the libstdc++ v5 transition. Thanks Simon
+ McVittie for providing the necessary patch and chasing all this up.
+ Closes: #799641.
+ * Run gzip with -n to enable reproducible builds
+
+ -- Michael Tautschnig <mt at debian.org> Mon, 21 Sep 2015 12:27:25 +0100
+
ppl (1:1.1-6) unstable; urgency=low
* Re-adopting the package. Closes: #791996.
diff --git a/debian/control b/debian/control
index 542c21b..152d60c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,13 @@ Build-Depends: debhelper (>= 6.0.7~), dh-autoreconf,
Build-Depends-Indep: doxygen-latex, graphviz, poppler-utils, ghostscript, texlive-math-extra
Homepage: http://www.cs.unipr.it/ppl/
-Package: libppl13
+Package: libppl13v5
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libppl13
+Replaces: libppl13
Description: Parma Polyhedra Library (runtime library)
The Parma Polyhedra Library (PPL) is a C++ library for the
manipulation of (not necessarily closed) convex polyhedra and other
@@ -30,7 +32,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Section: libdevel
-Depends: libppl13 (= ${binary:Version}), libppl-c4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libppl13v5 (= ${binary:Version}), libppl-c4 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Provides: libppl-c-dev, libppl0.12-dev
Recommends: libgmp3-dev (>= 4.1.3)
# B+R: libppl6 can be removed after stretch was released
@@ -75,7 +77,7 @@ Package: libppl-c4
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libppl13 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libppl13v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Parma Polyhedra Library (C interface)
The Parma Polyhedra Library (PPL) is a C++ library for the
manipulation of (not necessarily closed) convex polyhedra and other
@@ -110,7 +112,7 @@ Package: libppl-swi
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libppl13 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, swi-prolog
+Depends: libppl13v5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, swi-prolog
Description: Parma Polyhedra Library (SWI Prolog interface)
The Parma Polyhedra Library (PPL) is a C++ library for the
manipulation of (not necessarily closed) convex polyhedra and other
diff --git a/debian/libppl-c4.links b/debian/libppl-c4.links
index 2fba597..a4d42cd 100644
--- a/debian/libppl-c4.links
+++ b/debian/libppl-c4.links
@@ -1 +1 @@
-usr/share/doc/libppl13 usr/share/doc/libppl-c4
+usr/share/doc/libppl13v5 usr/share/doc/libppl-c4
diff --git a/debian/libppl-swi.links b/debian/libppl-swi.links
index 44db245..0b2c006 100644
--- a/debian/libppl-swi.links
+++ b/debian/libppl-swi.links
@@ -1 +1 @@
-usr/share/doc/libppl13 usr/share/doc/libppl-swi
+usr/share/doc/libppl13v5 usr/share/doc/libppl-swi
diff --git a/debian/libppl13.dirs b/debian/libppl13v5.dirs
similarity index 100%
rename from debian/libppl13.dirs
rename to debian/libppl13v5.dirs
diff --git a/debian/libppl13.docs b/debian/libppl13v5.docs
similarity index 100%
rename from debian/libppl13.docs
rename to debian/libppl13v5.docs
diff --git a/debian/libppl13.install b/debian/libppl13v5.install
similarity index 100%
rename from debian/libppl13.install
rename to debian/libppl13v5.install
diff --git a/debian/patches/reproducible_builds_gzip_n b/debian/patches/reproducible_builds_gzip_n
new file mode 100644
index 0000000..e7fb64e
--- /dev/null
+++ b/debian/patches/reproducible_builds_gzip_n
@@ -0,0 +1,60 @@
+Description: Using gzip with -n for reproducible builds
+Author: Michael Tautschnig <mt at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- ppl-1.1.orig/doc/Makefile.am
++++ ppl-1.1/doc/Makefile.am
+@@ -1652,27 +1652,27 @@ endif BUILD_JAVA_INTERFACE
+
+ $(USER_CORE_HTML_MANUAL): user.doxyconf-html $(USER_CORE_STUFF)
+ $(MAKE) $(AM_MAKEFLAGS) $(USER_CORE_HTML_DIR)
+- tar c $(USER_CORE_HTML_DIR) | gzip --best --force > $@
++ tar c $(USER_CORE_HTML_DIR) | gzip -n--best --force > $@
+
+ $(USER_C_INTERFACE_HTML_MANUAL): $(USER_CORE_HTML_MANUAL) \
+ user-language-interface.doxyconf $(USER_C_INTERFACE_STUFF)
+ $(MAKE) $(AM_MAKEFLAGS) $(USER_C_INTERFACE_HTML_DIR)
+- tar c $(USER_C_INTERFACE_HTML_DIR) | gzip --best --force > $@
++ tar c $(USER_C_INTERFACE_HTML_DIR) | gzip -n--best --force > $@
+
+ $(USER_PROLOG_INTERFACE_HTML_MANUAL): $(USER_CORE_HTML_MANUAL) \
+ user-language-interface.doxyconf $(USER_PROLOG_INTERFACE_STUFF)
+ $(MAKE) $(AM_MAKEFLAGS) $(USER_PROLOG_INTERFACE_HTML_DIR)
+- tar c $(USER_PROLOG_INTERFACE_HTML_DIR) | gzip --best --force > $@
++ tar c $(USER_PROLOG_INTERFACE_HTML_DIR) | gzip -n--best --force > $@
+
+ $(USER_OCAML_INTERFACE_HTML_MANUAL): $(USER_CORE_HTML_MANUAL) \
+ user-language-interface.doxyconf $(USER_OCAML_INTERFACE_STUFF)
+ $(MAKE) $(AM_MAKEFLAGS) $(USER_OCAML_INTERFACE_HTML_DIR)
+- tar c $(USER_OCAML_INTERFACE_HTML_DIR) | gzip --best --force > $@
++ tar c $(USER_OCAML_INTERFACE_HTML_DIR) | gzip -n--best --force > $@
+
+ $(USER_JAVA_INTERFACE_HTML_MANUAL): $(USER_CORE_HTML_MANUAL) \
+ user-language-interface.doxyconf $(USER_JAVA_INTERFACE_STUFF)
+ $(MAKE) $(AM_MAKEFLAGS) $(USER_JAVA_INTERFACE_HTML_DIR)
+- tar c $(USER_JAVA_INTERFACE_HTML_DIR) | gzip --best --force > $@
++ tar c $(USER_JAVA_INTERFACE_HTML_DIR) | gzip -n--best --force > $@
+
+ ############################################################################
+
+@@ -1680,7 +1680,7 @@ user-language-interface.doxyconf $(USER_
+ tar cf $@ $<
+
+ %.gz: %
+- gzip --best --force $<
++ gzip -n --best --force $<
+
+ %.pdf: %.tex
+ $(TEX_ENV) pdflatex $<
diff --git a/debian/patches/series b/debian/patches/series
index 85383c2..1b34177 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
latex-header.diff
link-tests-with-libmpq.diff
doxygen-update.diff
+reproducible_builds_gzip_n
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ppl.git
More information about the debian-science-commits
mailing list