[SCM] grounding tools for (disjunctive) logic programs branch, master, updated. cdb3ccccb9bc223c659863171ffbbab7d07ded15
Thomas Krennwallner
tkren at kr.tuwien.ac.at
Tue May 21 17:10:17 UTC 2013
The following commit has been merged in the master branch:
commit 8b593c35fbc843db36310869b76d4efd55ef0ce6
Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
Date: Tue May 21 18:57:05 2013 +0200
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index 55c1b5d..d010286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gringo (3.0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/copyright: Update copyright years.
+ * debian/compat: Bump to version 9.
+ * debian/control: Remove DM-Upload-Allowed.
+ * debian/watch: Only watch upstream gringo >= 3.
+ * debian/patches/gringo-clang-gcc.patch debian/patches/gringo-cond.patch
+ debian/patches/gringo-domain-fwd-decl.patch
+ debian/patches/gringo-unpool-pred.patch debian/patches/series: Remove
+ already applied patches.
+
+ -- Thomas Krennwallner <tkren at kr.tuwien.ac.at> Tue, 21 May 2013 18:31:03 +0200
+
gringo (3.0.4-4) unstable; urgency=low
* Apply upstream patches from subversion r6200 and r6237 for fixing
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index a9d5428..5a2bcfb 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: interpreters
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 8.0.0),
cmake,
re2c,
diff --git a/debian/copyright b/debian/copyright
index 314642e..3a38f3b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -132,7 +132,7 @@ License: BSD-like License with advertising clause
Files: debian/*
-Copyright: 2010-2011, Thomas Krennwallner
+Copyright: 2010-2013, Thomas Krennwallner
License: GPL-3+
This package was debianized by Thomas Krennwallner <tkren at kr.tuwien.ac.at>
on Thu, 04 Mar 2010 19:47:14 +0100
diff --git a/debian/patches/gringo-clang-gcc.patch b/debian/patches/gringo-clang-gcc.patch
deleted file mode 100644
index e103af4..0000000
--- a/debian/patches/gringo-clang-gcc.patch
+++ /dev/null
@@ -1,258 +0,0 @@
-Description: Fix FTBFS with g++ 4.7 and clang
-Forwarded: http://sourceforge.net/tracker/?func=detail&atid=1107486&aid=3516305&group_id=238741
-Bug-Debian: http://bugs.debian.org/667193
-Origin: upstream, https://potassco.svn.sourceforge.net/svnroot/potassco/tags/gringo-3.0.4/patches/patch-clang.diff
-Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
-Last-Update: 2012-03-01
-
-Index: gringo-3.0.4-source/libgringo/gringo/aggrlit.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/aggrlit.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/aggrlit.h 2012-04-10 15:31:39.000000000 +0200
-@@ -118,9 +118,13 @@
- clone_ptr<Term> weight_;
- };
-
--inline WeightLit* new_clone(const WeightLit& a)
-+namespace boost
- {
-- return static_cast<WeightLit*>(a.clone());
-+ template <>
-+ inline WeightLit* new_clone(const WeightLit& a)
-+ {
-+ return static_cast<WeightLit*>(a.clone());
-+ }
- }
-
- class CondLit : public Groundable, public Locateable
-Index: gringo-3.0.4-source/libgringo/gringo/clone_ptr.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/clone_ptr.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/clone_ptr.h 2012-04-10 15:31:39.000000000 +0200
-@@ -17,6 +17,8 @@
-
- #pragma once
-
-+#include <boost/ptr_container/clone_allocator.hpp>
-+
- template<typename T>
- class clone_ptr
- {
-@@ -50,7 +52,7 @@
-
- template<typename T>
- inline clone_ptr<T>::clone_ptr(const clone_ptr<T> &ptr)
-- : ptr_(ptr.get() ? new_clone(*ptr.get()) : 0)
-+ : ptr_(ptr.get() ? boost::new_clone(*ptr.get()) : 0)
- {
- }
-
-Index: gringo-3.0.4-source/libgringo/gringo/gringo.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/gringo.h 2012-01-26 13:02:17.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/gringo.h 2012-04-10 15:31:39.000000000 +0200
-@@ -76,7 +76,6 @@
- class Instantiator;
- class Lexer;
- class Lit;
--class Loc;
- class LuaLit;
- class LuaTerm;
- class LparseConverter;
-@@ -101,8 +100,8 @@
- class IncLit;
- class IncConfig;
- class Streams;
--class TermExpansion;
-
-+struct TermExpansion;
- struct Loc;
-
- namespace LitDep
-@@ -130,12 +129,22 @@
- typedef std::vector<VarSig> VarSigVec;
- typedef std::auto_ptr<TermExpansion> TermExpansionPtr;
-
--Term* new_clone(const Term& a);
--VarTerm* new_clone(const VarTerm& a);
--Lit* new_clone(const Lit& a);
--WeightLit* new_clone(const WeightLit& a);
--Instantiator* new_clone(const Instantiator& a);
--LitDep::GrdNode* new_clone(const LitDep::GrdNode& a);
--CondLit* new_clone(const CondLit& a);
-+namespace boost
-+{
-+ template <>
-+ Term* new_clone(const Term& a);
-+ template <>
-+ VarTerm* new_clone(const VarTerm& a);
-+ template <>
-+ Lit* new_clone(const Lit& a);
-+ template <>
-+ WeightLit* new_clone(const WeightLit& a);
-+ template <>
-+ Instantiator* new_clone(const Instantiator& a);
-+ template <>
-+ LitDep::GrdNode* new_clone(const LitDep::GrdNode& a);
-+ template <>
-+ CondLit* new_clone(const CondLit& a);
-+}
-
- #endif
-Index: gringo-3.0.4-source/libgringo/gringo/instantiator.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/instantiator.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/instantiator.h 2012-04-10 15:31:39.000000000 +0200
-@@ -35,9 +35,12 @@
- IntVec new_;
- };
-
--inline Instantiator* new_clone(const Instantiator& a)
-+namespace boost
- {
-- (void)a;
-- return 0;
-+ template <>
-+ inline Instantiator* new_clone(const Instantiator& a)
-+ {
-+ (void)a;
-+ return 0;
-+ }
- }
--
-Index: gringo-3.0.4-source/libgringo/gringo/lit.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/lit.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/lit.h 2012-04-10 15:31:39.000000000 +0200
-@@ -73,8 +73,11 @@
- bool head_;
- };
-
--inline Lit* new_clone(const Lit& a)
-+namespace boost
- {
-- return a.clone();
-+ template <>
-+ inline Lit* new_clone(const Lit& a)
-+ {
-+ return a.clone();
-+ }
- }
--
-Index: gringo-3.0.4-source/libgringo/gringo/litdep.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/litdep.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/litdep.h 2012-04-10 15:31:39.000000000 +0200
-@@ -113,9 +113,12 @@
- };
- }
-
--inline LitDep::GrdNode* new_clone(const LitDep::GrdNode& a)
-+namespace boost
- {
-- (void)a;
-- return 0;
-+ template <>
-+ inline LitDep::GrdNode* new_clone(const LitDep::GrdNode& a)
-+ {
-+ (void)a;
-+ return 0;
-+ }
- }
--
-Index: gringo-3.0.4-source/libgringo/gringo/optimize.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/optimize.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/optimize.h 2012-04-10 15:31:39.000000000 +0200
-@@ -26,10 +26,9 @@
-
- class Optimize : public Statement
- {
--private:
-+public:
- class PrioLit;
- typedef std::vector<std::pair<int32_t, int32_t> > PrioVec;
-- friend PrioLit* new_clone(const PrioLit& a);
- public:
- class Printer : public ::Printer
- {
-@@ -71,5 +70,9 @@
- PredLitSetPtr uniques_;
- };
-
--Optimize::PrioLit* new_clone(const Optimize::PrioLit& a);
-+namespace boost
-+{
-+ template <>
-+ Optimize::PrioLit* new_clone(const Optimize::PrioLit& a);
-+}
-
-Index: gringo-3.0.4-source/libgringo/gringo/parser.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/parser.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/parser.h 2012-04-10 15:31:39.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <gringo/lexer_impl.h>
- #include <gringo/locateable.h>
- #include <gringo/optimize.h>
-+#include <gringo/domain.h>
-
- class Parser : public LexerImpl
- {
-Index: gringo-3.0.4-source/libgringo/gringo/term.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/term.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/term.h 2012-04-10 15:31:39.000000000 +0200
-@@ -64,8 +64,11 @@
- virtual ~Term() { }
- };
-
--inline Term* new_clone(const Term& a)
-+namespace boost
- {
-- return a.clone();
-+ template <>
-+ inline Term* new_clone(const Term& a)
-+ {
-+ return a.clone();
-+ }
- }
--
-Index: gringo-3.0.4-source/libgringo/gringo/varterm.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/varterm.h 2012-01-26 12:11:43.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/varterm.h 2012-04-10 15:31:39.000000000 +0200
-@@ -45,8 +45,11 @@
- uint32_t local_ : 1;
- };
-
--inline VarTerm* new_clone(const VarTerm& a)
-+namespace boost
- {
-- return static_cast<VarTerm*>(a.clone());
-+ template<>
-+ inline VarTerm* new_clone(const VarTerm& a)
-+ {
-+ return static_cast<VarTerm*>(a.clone());
-+ }
- }
--
-Index: gringo-3.0.4-source/libgringo/src/aggrlit.cpp
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/src/aggrlit.cpp 2012-01-26 12:11:44.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/src/aggrlit.cpp 2012-04-10 15:31:39.000000000 +0200
-@@ -337,8 +337,11 @@
- {
- }
-
--CondLit* new_clone(const CondLit& a)
-+namespace boost
- {
-- return new CondLit(a);
-+ template <>
-+ CondLit* new_clone(const CondLit& a)
-+ {
-+ return new CondLit(a);
-+ }
- }
--
diff --git a/debian/patches/gringo-cond.patch b/debian/patches/gringo-cond.patch
deleted file mode 100644
index 03467ec..0000000
--- a/debian/patches/gringo-cond.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Description: Fixes segfault with conditionals.
-Origin: upstream, http://sourceforge.net/p/potassco/code/6291/tree/tags/gringo-3.0.4/patches/patch-cond.diff?format=raw
-Bug: http://sourceforge.net/p/potassco/bugs/75/
-Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
-Last-Update: 2012-11-04
-
-Index: gringo-3.0.4-source/libgringo/gringo/predlit.h
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/gringo/predlit.h 2012-11-22 10:29:40.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/gringo/predlit.h 2012-11-22 10:30:04.000000000 +0100
-@@ -35,6 +35,7 @@
- typedef boost::unordered_set<PredSig, PredCmp, PredCmp> PredSet;
- public:
- PredLitSet();
-+ PredLitSet(PredLitSet const &other);
- bool insert(PredLit *pred, size_t pos, Val &val);
- void clear();
- private:
-Index: gringo-3.0.4-source/libgringo/src/predlit.cpp
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/src/predlit.cpp 2012-11-22 10:29:44.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/src/predlit.cpp 2012-11-22 10:30:04.000000000 +0100
-@@ -53,6 +53,12 @@
- {
- }
-
-+PredLitSet::PredLitSet(PredLitSet const &other)
-+ : set_(0, PredCmp(vals_), PredCmp(vals_))
-+{
-+ assert(other.vals_.empty());
-+}
-+
- bool PredLitSet::insert(PredLit *pred, size_t pos, Val &val)
- {
- ValRng rng = pred->vals(pos);
-@@ -133,6 +139,10 @@
- void PredLit::push()
- {
- top_ = vals_.size();
-+ for (size_t i = vals_.size() - terms_.size(), end = vals_.size(); i != end; ++i)
-+ {
-+ vals_.push_back(vals_[i]);
-+ }
- }
-
- bool PredLit::testUnique(PredLitSet &set, Val val)
diff --git a/debian/patches/gringo-domain-fwd-decl.patch b/debian/patches/gringo-domain-fwd-decl.patch
deleted file mode 100644
index ba3056a..0000000
--- a/debian/patches/gringo-domain-fwd-decl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Thomas Krennwallner <tkren at kr.tuwien.ac.at>
-Description: Fix invalid use of incomplete type Domain compile error.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652787
-Index: gringo-3.0.3-source/libgringo/src/parser.r2c
-===================================================================
---- gringo-3.0.3-source.orig/libgringo/src/parser.r2c 2010-11-03 22:24:59.000000000 +0100
-+++ gringo-3.0.3-source/libgringo/src/parser.r2c 2011-12-25 18:19:11.000000000 +0100
-@@ -22,6 +22,7 @@
- #include <gringo/constterm.h>
- #include <gringo/prgvisitor.h>
- #include <gringo/predlit.h>
-+#include <gringo/domain.h>
- #include <gringo/rule.h>
- #include <gringo/streams.h>
- #include <gringo/grounder.h>
diff --git a/debian/patches/gringo-unpool-pred.patch b/debian/patches/gringo-unpool-pred.patch
deleted file mode 100644
index d0b0b6f..0000000
--- a/debian/patches/gringo-unpool-pred.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fixes grounding bug.
-Origin: upstream, http://sourceforge.net/p/potassco/code/6291/tree/tags/gringo-3.0.4/patches/patch-unpool-pred.diff?format=raw.
-Bug: http://sourceforge.net/p/potassco/bugs/76/
-Author: Roland Kaminski <kaminski at cs.uni-potsdam.de>
-Last-Update: 2012-11-12
-
-Index: gringo-3.0.4-source/libgringo/src/predlit.cpp
-===================================================================
---- gringo-3.0.4-source.orig/libgringo/src/predlit.cpp 2012-11-22 10:29:41.000000000 +0100
-+++ gringo-3.0.4-source/libgringo/src/predlit.cpp 2012-11-22 10:29:44.000000000 +0100
-@@ -233,7 +233,9 @@
- {
- for(Term::Split s = i->split(); s.first; s = i->split())
- {
-- expander->expand(new PredLit(loc(), g->domain(dom_->nameId(), s.second->size()), *s.second), Expander::POOL);
-+ PredLit *p = new PredLit(loc(), g->domain(dom_->nameId(), s.second->size()), *s.second);
-+ p->sign(sign());
-+ expander->expand(p, Expander::POOL);
- terms_.replace(i, s.first);
- }
- i->normalize(this, Term::VecRef(terms_, i), g, expander, !head() && !sign());
diff --git a/debian/patches/series b/debian/patches/series
index e94a319..95843bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-gringo-domain-fwd-decl.patch
gringo-manpages.patch
-gringo-clang-gcc.patch
-gringo-unpool-pred.patch
-gringo-cond.patch
diff --git a/debian/watch b/debian/watch
index 0380eef..01f3a53 100644
--- a/debian/watch
+++ b/debian/watch
@@ -6,4 +6,4 @@ version=3
# qa.debian.org runs a redirector which allows a simpler form of URL
# for SourceForge based projects. The format below will automatically
# be rewritten to use the redirector.
-http://sf.net/potassco/gringo-([\d\.]+)-source\.tar\.gz
+http://sf.net/potassco/gringo-3\.([\d\.]+)-source\.tar\.gz
--
grounding tools for (disjunctive) logic programs
More information about the debian-science-commits
mailing list