[ppl] 40/68: Imported Debian patch 0.11.2-4
Andreas Tille
tille at debian.org
Sat Nov 12 08:41:16 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 18e515b0489b0b75b0078ef28b1fec7776fcf1af
Author: Michael Tautschnig <mt at debian.org>
Date: Sun Jul 10 12:05:38 2011 +0200
Imported Debian patch 0.11.2-4
---
debian/changelog | 7 ++
debian/libppl-swi.install | 3 +-
debian/patches/debian-changes-0.11.2-4 | 212 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 222 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index cd162b3..602523b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ppl (0.11.2-4) unstable; urgency=low
+
+ * Patch away unused variables. Closes: #625417.
+ * Don't ship libppl_swiprolog.la. Closes: #633365.
+
+ -- Michael Tautschnig <mt at debian.org> Sun, 10 Jul 2011 12:05:38 +0200
+
ppl (0.11.2-3) unstable; urgency=low
* Build-depends-indep: re-added texlive-math-extra. Closes: #618148.
diff --git a/debian/libppl-swi.install b/debian/libppl-swi.install
index 553bcac..c1eb0ac 100644
--- a/debian/libppl-swi.install
+++ b/debian/libppl-swi.install
@@ -1,3 +1,4 @@
-usr/lib/ppl/libppl_swiprolog*
+usr/lib/ppl/libppl_swiprolog.so
+usr/lib/ppl/libppl_swiprolog.a
usr/lib/ppl/ppl_swiprolog.*
usr/bin/ppl_pl
diff --git a/debian/patches/debian-changes-0.11.2-4 b/debian/patches/debian-changes-0.11.2-4
new file mode 100644
index 0000000..318793c
--- /dev/null
+++ b/debian/patches/debian-changes-0.11.2-4
@@ -0,0 +1,212 @@
+Description: Upstream changes introduced in version 0.11.2-4
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ ppl (0.11.2-4) unstable; urgency=low
+ .
+ * Patch away unused variables. Closes: #625417.
+ * Don't ship libppl_swiprolog.la. Closes: #633365.
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Michael Tautschnig <mt at debian.org>
+Bug-Debian: http://bugs.debian.org/625417
+Bug-Debian: http://bugs.debian.org/633365
+
+---
+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: http://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-0.11.2.orig/src/Interval.inlines.hh
++++ ppl-0.11.2/src/Interval.inlines.hh
+@@ -342,9 +342,8 @@ Interval<To_Boundary, To_Info>::intersec
+ PPL_ASSERT(f_OK(x));
+ if (!intersect_restriction(info(), *this, x))
+ return assign(EMPTY);
+- Result rl, ru;
+- rl = max_assign(LOWER, lower(), info(), LOWER, f_lower(x), f_info(x));
+- ru = min_assign(UPPER, upper(), info(), UPPER, f_upper(x), f_info(x));
++ max_assign(LOWER, lower(), info(), LOWER, f_lower(x), f_info(x));
++ min_assign(UPPER, upper(), info(), UPPER, f_upper(x), f_info(x));
+ PPL_ASSERT(OK());
+ return I_ANY;
+ }
+--- ppl-0.11.2.orig/src/Interval.templates.hh
++++ ppl-0.11.2/src/Interval.templates.hh
+@@ -33,7 +33,7 @@ template <typename C>
+ typename Enable_If<Is_Same_Or_Derived<I_Constraint_Base, C>::value, I_Result>::type
+ Interval<Boundary, Info>::lower_extend(const C& c) {
+ PPL_ASSERT(OK());
+- bool open;
++ bool open = false;
+ switch (c.rel()) {
+ case V_LGE:
+ return lower_extend();
+@@ -59,7 +59,7 @@ template <typename C>
+ typename Enable_If<Is_Same_Or_Derived<I_Constraint_Base, C>::value, I_Result>::type
+ Interval<Boundary, Info>::upper_extend(const C& c) {
+ PPL_ASSERT(OK());
+- bool open;
++ bool open = false;
+ switch (c.rel()) {
+ case V_LGE:
+ return lower_extend();
+--- ppl-0.11.2.orig/src/Grid_public.cc
++++ ppl-0.11.2/src/Grid_public.cc
+@@ -2734,8 +2734,8 @@ PPL::Grid::wrap_assign(const Variables_S
+ PPL_DIRTY_TEMP_COEFFICIENT(f_d);
+ PPL_DIRTY_TEMP_COEFFICIENT(v_n);
+ PPL_DIRTY_TEMP_COEFFICIENT(v_d);
+- for (Variables_Set::const_iterator i = vars.begin(),
+- vars_end = vars.end(); i != vars.end(); ++i) {
++ for (Variables_Set::const_iterator i = vars.begin();
++ i != vars.end(); ++i) {
+ const Variable x = Variable(*i);
+ // Find the frequency and a value for `x' in `gr'.
+ if (!gr.frequency_no_check(x, f_n, f_d, v_n, v_d))
+@@ -2816,8 +2816,8 @@ PPL::Grid::wrap_assign(const Variables_S
+ const Coefficient& div = point.divisor();
+ max_value *= div;
+ min_value *= div;
+- for (Variables_Set::const_iterator i = vars.begin(),
+- vars_end = vars.end(); i != vars.end(); ++i) {
++ for (Variables_Set::const_iterator i = vars.begin();
++ i != vars.end(); ++i) {
+ const Variable x = Variable(*i);
+ if (!gr.bounds_no_check(x)) {
+ // `x' is not a constant in `gr'.
+@@ -2885,8 +2885,8 @@ PPL::Grid::drop_some_non_integer_points(
+ // those points that have integer coordinates for all the dimensions
+ // in vars. All points in \p *this with non-integral coordinates for
+ // the dimensions in vars are removed.
+- for (Variables_Set::const_iterator i = vars.begin(),
+- vars_end = vars.end(); i != vars.end(); ++i)
++ for (Variables_Set::const_iterator i = vars.begin();
++ i != vars.end(); ++i)
+ add_congruence(Variable(*i) %= 0);
+
+ PPL_ASSERT(OK());
+--- ppl-0.11.2.orig/src/wrap_assign.hh
++++ ppl-0.11.2/src/wrap_assign.hh
+@@ -123,8 +123,8 @@ wrap_assign_col(PSET& dest,
+ PSET p(src);
+ if (pcs != 0)
+ p.refine_with_constraints(*pcs);
+- for (Variables_Set::const_iterator i = vars.begin(),
+- vars_end = vars.end(); i != vars.end(); ++i) {
++ for (Variables_Set::const_iterator i = vars.begin();
++ i != vars.end(); ++i) {
+ const Variable x = Variable(*i);
+ p.refine_with_constraint(min_value <= x);
+ p.refine_with_constraint(x <= max_value);
+--- ppl-0.11.2.orig/tests/ppl_test.hh
++++ ppl-0.11.2/tests/ppl_test.hh
+@@ -129,12 +129,16 @@ catch (const std::exception& e) { \
+ #define DO_TEST(test) \
+ ANNOUNCE_TEST(test); \
+ RUN_TEST(test); \
++ /* dummy use to make gcc happy */ \
++ overflow = overflow; \
+ if (!succeeded) \
+ failed_tests.push_back(#test);
+
+ #define DO_TEST_F(test) \
+ ANNOUNCE_TEST(test); \
+ RUN_TEST(test); \
++ /* dummy use to make gcc happy */ \
++ overflow = overflow; \
+ if (succeeded) \
+ unexpectedly_succeeded_tests.push_back(#test);
+
+--- ppl-0.11.2.orig/Watchdog/tests/pwl_test.hh
++++ ppl-0.11.2/Watchdog/tests/pwl_test.hh
+@@ -118,12 +118,16 @@ catch (const std::exception& e) { \
+ #define DO_TEST(test) \
+ ANNOUNCE_TEST(test); \
+ RUN_TEST(test); \
++ /* dummy use to make gcc happy */ \
++ overflow = overflow; \
+ if (!succeeded) \
+ failed_tests.push_back(#test);
+
+ #define DO_TEST_F(test) \
+ ANNOUNCE_TEST(test); \
+ RUN_TEST(test); \
++ /* dummy use to make gcc happy */ \
++ overflow = overflow; \
+ if (succeeded) \
+ failed_tests.push_back(#test);
+
+--- ppl-0.11.2.orig/src/Interval.defs.hh
++++ ppl-0.11.2/src/Interval.defs.hh
+@@ -649,7 +649,7 @@ public:
+ return true;
+ }
+
+- Interval() {
++ Interval() : lower_(1), upper_(0) {
+ }
+
+ template <typename T>
+--- ppl-0.11.2.orig/tests/BD_Shape/relations3.cc
++++ ppl-0.11.2/tests/BD_Shape/relations3.cc
+@@ -39,7 +39,7 @@ test01() {
+ // BD_Shape::relation_with(c):
+ // it is illegal to use a constraint that is
+ // dimensional incompatible with the BDS.
+- Poly_Con_Relation rel = bds.relation_with(C - B <= 2);
++ bds.relation_with(C - B <= 2);
+ }
+ catch (std::invalid_argument& e) {
+ nout << "std::invalid_argument: " << endl;
+@@ -80,7 +80,7 @@ test03() {
+ // BD_Shape::relation_with(c):
+ // it is illegal to use a generator that is
+ // dimensional incompatible with the BDS.
+- Poly_Gen_Relation rel = bds.relation_with(ray(C));
++ bds.relation_with(ray(C));
+ }
+ catch (std::invalid_argument& e) {
+ nout << "std::invalid_argument: " << endl;
+--- ppl-0.11.2.orig/tests/Box/relations4.cc
++++ ppl-0.11.2/tests/Box/relations4.cc
+@@ -431,7 +431,7 @@ test19() {
+
+ try {
+ // This tests the space dimension exception..
+- Poly_Con_Relation rel = box.relation_with((A + B %= 1) / 9);
++ box.relation_with((A + B %= 1) / 9);
+ }
+ catch (std::invalid_argument& e) {
+ nout << "std::invalid_argument: " << endl;
+--- ppl-0.11.2.orig/tests/Octagonal_Shape/relatwithcons2.cc
++++ ppl-0.11.2/tests/Octagonal_Shape/relatwithcons2.cc
+@@ -305,7 +305,7 @@ test14() {
+ // Octagon::relation_with(c):
+ // it is illegal to use a constraint that is not dimension-compatible
+ // with the octagon.
+- Poly_Con_Relation rel = oc.relation_with(-C - B <= 2);
++ oc.relation_with(-C - B <= 2);
+ }
+ catch (std::invalid_argument& e) {
+ nout << "std::invalid_argument: " << e.what() << endl;
+--- ppl-0.11.2.orig/tests/Octagonal_Shape/relatwithgen1.cc
++++ ppl-0.11.2/tests/Octagonal_Shape/relatwithgen1.cc
+@@ -271,7 +271,7 @@ test12() {
+ // Octagon::relation_with(g):
+ // it is illegal to use a generator that is
+ // dimensional incompatible with the OS.
+- Poly_Gen_Relation rel = oc.relation_with(ray(C));
++ oc.relation_with(ray(C));
+ }
+ catch (std::invalid_argument& e) {
+ nout << "std::invalid_argument: " << e.what() << endl;
diff --git a/debian/patches/series b/debian/patches/series
index fc7cd8a..62f5d8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
debian-changes-0.11-2
debian-changes-0.11.2-1
+debian-changes-0.11.2-4
--
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