[gfan] 01/01: Imported Debian patch 0.5+dfsg-5
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Wed Jul 13 20:51:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository gfan.
commit a5e7860247c632edff0cd3bbe8ddaf3a354119a9
Author: Cédric Boutillier <boutil at debian.org>
Date: Sun Oct 26 18:54:17 2014 +0100
Imported Debian patch 0.5+dfsg-5
---
debian/changelog | 13 ++
debian/control | 2 +-
debian/copyright | 2 +-
debian/patches/fix_compilation_clang.diff | 70 +++++++
debian/patches/fix_other_warnings_clang.diff | 301 +++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/source/local-options | 2 -
debian/{upstream => upstream/metadata} | 0
8 files changed, 388 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9f34d35..77426c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gfan (0.5+dfsg-5) unstable; urgency=medium
+
+ * debian/patches:
+ + add fix_compilation_clang.diff to properly forward declare some classes
+ (Closes: #755308)
+ + add fix_other_warnings_clang.diff to remove some other warnings about
+ format strings and a typo in a macro name
+ * debian/copyright: fix upstream email address
+ * Bump Standards-Version to 3.9.6 (no changes needed)
+ * Move upstream info to debian/upstream/metadata
+
+ -- Cédric Boutillier <boutil at debian.org> Sun, 26 Oct 2014 18:54:17 +0100
+
gfan (0.5+dfsg-4) unstable; urgency=low
* add fix_GetUniqueGenerators_symmetry.patch to fix a range error causing a
diff --git a/debian/control b/debian/control
index b0ad6e9..1938258 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Tim Abbott <tabbott at mit.edu>, Cédric Boutillier <boutil at debian.org>
Homepage: http://home.imf.au.dk/jensen/software/gfan/gfan.html
Build-Depends: debhelper (>= 9), libgmp3-dev, libcdd-dev (>= 094g~), dpkg-dev (>= 1.16.1~)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Package: gfan
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 79c9040..50a1a5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Comment: upstream tarball repacked to remove doc/ directory
doc/ was containing a (non-free) manual which is not allowed to be changed
Files: *
-Copyright: 2005-2007 Anders Nedergaard Jensen <jensen at math.tu-berlin.de>
+Copyright: 2005-2007 Anders Nedergaard Jensen <jensen at imf.au.dk>
License: GPL-2
Files: debian/*
diff --git a/debian/patches/fix_compilation_clang.diff b/debian/patches/fix_compilation_clang.diff
new file mode 100644
index 0000000..4b2db64
--- /dev/null
+++ b/debian/patches/fix_compilation_clang.diff
@@ -0,0 +1,70 @@
+Description: add some declarations
+ this fixes compilation with clang
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755308
+Author: Alexander <sanek23994 at gmail.com>
+Reviewed-by: Cédric Boutillier <boutil at debian.org>
+Forwarded: yes
+Last-Updated: 2014-08-23
+
+--- ./gfanlib_polyhedralfan.h 2013-01-17 02:56:44.000000000 +0400
++++ ../gfan-0.5+dfsg-my/./gfanlib_polyhedralfan.h 2014-07-30 01:18:03.107800271 +0400
+@@ -24,6 +24,8 @@
+ typedef std::map<int,IntVectorList> IncidenceList;
+
+
++class PolyhedralFan;
++PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
+
+ /** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
+ * It contains no combinatorial information in the sense of a polyhedral complex.
+@@ -52,7 +54,7 @@
+ int getAmbientDimension()const;
+ int getMaxDimension()const;
+ int getMinDimension()const;
+- friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
++ friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
+ ZMatrix getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
+ ZMatrix getRelativeInteriorPoints();
+ void insert(ZCone const &c);
+--- ./polyhedralfan.h 2013-01-17 02:56:44.000000000 +0400
++++ ../gfan-0.5+dfsg-my/./polyhedralfan.h 2014-07-30 01:15:14.143339210 +0400
+@@ -31,6 +31,9 @@
+ };
+
+
++class PolyhedralFan;
++PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
++
+ /** A PolyhedralFan is simply a collection of canonicalized PolyhedralCones.
+ * It contains no combinatorial information in the sense of a polyhedral complex.
+ * A cone being present in the PolyhedralFan corresponds to the cone and all its facets being present
+@@ -74,7 +77,7 @@
+ int getAmbientDimension()const;
+ int getMaxDimension()const;
+ int getMinDimension()const;
+- friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension=-1, bool allowASingleConeOfCutOffDimension=false);
++ friend PolyhedralFan refinement(const PolyhedralFan &a, const PolyhedralFan &b, int cutOffDimension, bool allowASingleConeOfCutOffDimension);
+ friend PolyhedralFan product(const PolyhedralFan &a, const PolyhedralFan &b);
+ IntegerVectorList getRays(int dim=1);//This can be called for other dimensions than 1. The term "Rays" still makes sense modulo the common linearity space
+ IntegerVectorList getRelativeInteriorPoints();
+--- ./halfopencone.h 2013-01-17 02:56:44.000000000 +0400
++++ ../gfan-0.5+dfsg-my/./halfopencone.h 2014-07-30 01:16:18.730161320 +0400
+@@ -6,6 +6,9 @@
+
+ #include "polyhedralfan.h"
+
++class HalfOpenCone;
++HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
++
+ class HalfOpenCone{
+ static void appendList(IntegerVectorList &to, IntegerVectorList const &from, int appendValue);
+ int liftedDimension;//ambient
+@@ -18,7 +21,7 @@
+ HalfOpenCone(int dimension_, IntegerVectorList const &equations, IntegerVectorList const &nonstrict, IntegerVectorList const &strict, bool findFacets=false, bool canonicalize=false);
+ HalfOpenCone(int ambientDimension);//full space
+ bool isEmpty();
+- friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets=false);
++ friend HalfOpenCone intersection(const HalfOpenCone &a, const HalfOpenCone &b, bool findFacets);
+ friend bool haveEmptyIntersection(const HalfOpenCone &a, const HalfOpenCone &b);
+ PolyhedralCone closure();
+ void splitIntoRelativelyOpenCones(list<HalfOpenCone> &l);
diff --git a/debian/patches/fix_other_warnings_clang.diff b/debian/patches/fix_other_warnings_clang.diff
new file mode 100644
index 0000000..6e96dca
--- /dev/null
+++ b/debian/patches/fix_other_warnings_clang.diff
@@ -0,0 +1,301 @@
+Description: fix some warnings emmitted by clang
+ - typo in macro
+ - type warning in format strings
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2014-10-26
+
+--- a/app_normalfancleanup.cpp
++++ b/app_normalfancleanup.cpp
+@@ -71,7 +71,7 @@
+ FILE *f=fopen("iteraTIon","w");
+ if(f)
+ {
+- fprintf(f,"%i:%i\n",a,l2.size());
++ fprintf(f,"%i:%lu\n",a,l2.size());
+ fclose(f);
+ }
+ }
+--- a/app_secondaryfan.cpp
++++ b/app_secondaryfan.cpp
+@@ -142,7 +142,7 @@
+
+ while(1)
+ {
+- fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size());
++ fprintf(stdout,"Triangles in current triangulation:%lu\n",a.bases.size());
+ PolyhedralCone C=a.secondaryCone();
+
+ C.canonicalize();
+@@ -198,7 +198,7 @@
+
+ while(1)
+ {
+- fprintf(stdout,"Triangles in current triangulation:%i\n",a.bases.size());
++ fprintf(stdout,"Triangles in current triangulation:%lu\n",a.bases.size());
+ // PolyhedralCone C=a.secondaryCone();
+
+ // C.canonicalize();
+@@ -214,7 +214,7 @@
+ {
+ Triangulation2 b=a;
+ b.flipNew(-*i);
+- fprintf(stdout,"Triangles in new triangulation:%i\n",b.bases.size());
++ fprintf(stdout,"Triangles in new triangulation:%lu\n",b.bases.size());
+
+ if(b.bases.size()==abortAtSize)
+ {
+--- a/app_test.cpp
++++ b/app_test.cpp
+@@ -128,7 +128,7 @@
+
+ M[I]=minusOne*M[I];
+ }
+- fprintf(Stdout,"Extreme permutations (%i):\n",extreme.size());
++ fprintf(Stdout,"Extreme permutations (%lu):\n",extreme.size());
+ P.printVectorList(extreme);
+ }
+
+--- a/xfig.h
++++ b/xfig.h
+@@ -52,7 +52,7 @@
+ void endDrawLine()
+ {
+ assert(p.size()>0);
+- fprintf(f," %i\n",p.size());
++ fprintf(f," %lu\n",p.size());
+ if(arrowOrigin)
+ fprintf(f,"\t 2 1 1.00 60.00 120.00\n");
+ if(arrowTarget)
+--- a/lp_cdd.cpp
++++ b/lp_cdd.cpp
+@@ -1287,8 +1287,8 @@
+ if(A->rowsize!=newLin.size()+newIn.size())
+ {
+ fprintf(stderr,"A->rowsize: %i\n",(int)A->rowsize);
+- fprintf(stderr,"newLin.size(): %i\n",newLin.size());
+- fprintf(stderr,"newIn.size(): %i\n",newIn.size());
++ fprintf(stderr,"newLin.size(): %lu\n",newLin.size());
++ fprintf(stderr,"newIn.size(): %lu\n",newIn.size());
+
+ dd_WriteMatrix(Stderr,A);
+
+--- a/vektor.cpp
++++ b/vektor.cpp
+@@ -96,7 +96,7 @@
+ int gcdOfVector(IntegerVector const &v)
+ {
+ int ret=0;
+- for(int i=0;i<v.size();i++)if(ret=v[i])break;
++ for(int i=0;i<v.size();i++)if((ret=v[i]))break;
+ if(ret<0)ret=-ret;
+ assert(ret!=0);
+ for(int i=0;i<v.size();i++)ret=gcdGFAN(ret,v[i]);
+--- a/buchberger.cpp
++++ b/buchberger.cpp
+@@ -540,7 +540,7 @@
+ {
+ static int t;
+ t++;
+- if((t&31)==0)fprintf(Stderr," spolys:%i\n",sPolynomials.size());
++ if((t&31)==0)fprintf(Stderr," spolys:%lu\n",sPolynomials.size());
+ }
+
+ {
+@@ -565,7 +565,7 @@
+ {
+ static int t;
+ if(((++t)&=31)==0)
+- fprintf(Stderr,"gsize:%i spolys:%i\n",g->size()+1,sPolynomials.size());
++ fprintf(Stderr,"gsize:%lu spolys:%lu\n",g->size()+1,sPolynomials.size());
+ }
+ PolynomialSet::iterator j=g->end();j--;
+ updatePairs(sPolynomials,g,&redundantOnes,j,indexj,truncationDegree,&grading);
+--- a/app_tropicaltraverse.cpp
++++ b/app_tropicaltraverse.cpp
+@@ -156,7 +156,7 @@
+ BergmanFan f=bergman(coneGroebnerBasis,idealGroebnerBasis,&s);
+ f.computeMultiplicities();
+ /* log1 fprintf(Stderr,"Is simplicial: %s\n",f.isSimplicial()?"true":"false");*/
+- log1 fprintf(Stderr,"Order of input symmetry group: %i\n",s.elements.size());
++ log1 fprintf(Stderr,"Order of input symmetry group: %lu\n",s.elements.size());
+ log1 fprintf(Stderr,"Number of maximal cones: %i\n",f.numberOfMaximalCones());
+ log1 fprintf(Stderr,"Modulo the homogeneity space:\n");
+ log1 AsciiPrinter(Stderr).printVectorList(hv);
+--- a/halfopencone.cpp
++++ b/halfopencone.cpp
+@@ -555,14 +555,14 @@
+ {
+ HalfOpenConeList surface=tropicalHyperSurface(*i);
+
+- fprintf(Stderr,"Number of cones in current intersection:%i\n",intersection.size());
+- fprintf(Stderr,"Number of cones in next surface:%i\n",surface.size());
++ fprintf(Stderr,"Number of cones in current intersection:%lu\n",intersection.size());
++ fprintf(Stderr,"Number of cones in next surface:%lu\n",surface.size());
+
+ fprintf(Stderr,"A\n");
+ intersection=refinement(intersection,surface);
+ fprintf(Stderr,"B\n");
+ }
+- fprintf(Stderr,"%i",intersection.size());
++ fprintf(Stderr,"%lu",intersection.size());
+
+ return intersection;
+ }
+--- a/genericwalk.cpp
++++ b/genericwalk.cpp
+@@ -202,7 +202,7 @@
+ g=newG;
+
+ nflips++;
+- fprintf(Stderr,"Flip %i, new size %i\n",nflips,g.size());
++ fprintf(Stderr,"Flip %i, new size %lu\n",nflips,g.size());
+ }
+ fprintf(Stderr,"Number of flips:%i\n",nflips);
+
+--- a/minkowskisum.cpp
++++ b/minkowskisum.cpp
+@@ -27,7 +27,7 @@
+
+ assert(f);
+ {
+- fprintf(f,"%i",polytopes.size());
++ fprintf(f,"%lu",polytopes.size());
+ TopcomPrinter p(f);
+ //AsciiPrinter p(f);
+
+--- a/bergman.cpp
++++ b/bergman.cpp
+@@ -149,7 +149,7 @@
+ if(0)
+ {
+ s=fullColoredIdeals(*g,false);
+- fprintf(Stderr,"Full colored ideals computed, #=%i\n",s.size());
++ fprintf(Stderr,"Full colored ideals computed, #=%lu\n",s.size());
+ }
+ else
+ {
+@@ -539,7 +539,7 @@
+ while(!active.empty())
+ {
+ log1 fprintf(Stderr,"\n-------------------------------------\n");
+- log1 fprintf(Stderr,"Size of active set: %i, Completed: %i\n",active.size(),ret.cones.size());
++ log1 fprintf(Stderr,"Size of active set: %i, Completed: %lu\n",active.size(),ret.cones.size());
+ log1 fprintf(Stderr,"-------------------------------------\n");
+ AsciiPrinter p(Stderr);
+
+--- a/polyhedralfan.cpp
++++ b/polyhedralfan.cpp
+@@ -604,7 +604,7 @@
+ {
+ // log0 fprintf(Stderr,"rayComplexSymmetry - begin\n");
+ PolyhedralFan ret(n);
+- log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size());
++ log1 fprintf(Stderr,"Computing rays of %lu cones\n",cones.size());
+ for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++)
+ {
+ {
+@@ -812,7 +812,7 @@
+ SymmetryGroup localsym(n);
+ if(!sym)sym=&localsym;
+ set<IntegerVector> rays;
+- log1 fprintf(Stderr,"Computing rays of %i cones\n",cones.size());
++ log1 fprintf(Stderr,"Computing rays of %lu cones\n",cones.size());
+ for(PolyhedralConeList::const_iterator i=cones.begin();i!=cones.end();i++)
+ {
+ {
+@@ -1212,7 +1212,7 @@
+ static int t;
+ if((t&1023)==0)
+ {
+- fprintf(Stderr,"clist size:%i\n",clist.size());
++ fprintf(Stderr,"clist size:%lu\n",clist.size());
+ }
+ t++;
+ }
+--- a/app_isgroebnerbasis.cpp
++++ b/app_isgroebnerbasis.cpp
+@@ -47,7 +47,7 @@
+ IntegerVectorListList sums;
+ IntegerVectorList polytope=minkowski(polytopes,&sums);
+
+- fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %i\n",polytope.size());
++ fprintf(Stderr,"Number of extreme vertices in Minkowski sum: %lu\n",polytope.size());
+
+ bool isGroebnerBasis=false;
+ int counter=0;
+--- a/gmpallocator.cpp
++++ b/gmpallocator.cpp
+@@ -145,19 +145,19 @@
+ //Debug
+ void *myAllocateFunctionD(size_t alloc_size)
+ {
+- fprintf(stderr,"Allocating: %i bytes.\n",alloc_size);
++ fprintf(stderr,"Allocating: %lu bytes.\n",alloc_size);
+ return malloc(alloc_size);
+ }
+
+ void *myReallocateFunctionD(void *ptr, size_t old_size, size_t new_size)
+ {
+- fprintf(stderr,"Reallocating: %i --> %i bytes.\n",old_size,new_size);
++ fprintf(stderr,"Reallocating: %lu --> %lu bytes.\n",old_size,new_size);
+ return realloc(ptr,new_size);
+ }
+
+ void myDeallocateFunctionD(void *ptr, size_t size)
+ {
+- fprintf(stderr,"Freeing: %i bytes.\n",size);
++ fprintf(stderr,"Freeing: %lu bytes.\n",size);
+ return free(ptr);
+ }
+
+--- a/symmetry.cpp
++++ b/symmetry.cpp
+@@ -300,7 +300,7 @@
+ l.push_back(*i);
+ }
+ P.printVectorList(l);
+- fprintf(f,"Group order=%i\n",elements.size());
++ fprintf(f,"Group order=%lu\n",elements.size());
+ P.printString("Done printing SymmetryGroup.\n");
+ }
+
+--- a/xfig.cpp
++++ b/xfig.cpp
+@@ -103,7 +103,7 @@
+ {
+ if(vertices.size())
+ {
+- fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %i\n ",7,vertices.size()+1);
++ fprintf(f,"2 3 0 1 0 %i 50 0 25 0.000 0 0 -1 0 0 %lu\n ",7,vertices.size()+1);
+
+ for(Polygon::const_iterator i=vertices.begin();i!=vertices.end();i++)
+ kickPoint(*i,mode);
+--- a/app_intsinpolytope.cpp
++++ b/app_intsinpolytope.cpp
+@@ -104,7 +104,7 @@
+ }
+ }
+
+- fprintf(stderr,"Sets to test: %i\n",setsToCheck.size());
++ fprintf(stderr,"Sets to test: %lu\n",setsToCheck.size());
+
+ set<set<int> > ret;
+ for(set<set<int> >::const_iterator i=setsToCheck.begin();i!=setsToCheck.end();i++)
+@@ -118,7 +118,7 @@
+ if(isPartOfAZBasis(l))ret.insert(*i);
+ }
+
+- fprintf(stderr,"Produced sets: %i\n",ret.size());
++ fprintf(stderr,"Produced sets: %lu\n",ret.size());
+
+ return ret;
+ }
+--- a/intsinpolytope.h
++++ b/intsinpolytope.h
+@@ -1,5 +1,5 @@
+ #ifndef INTSINPOLYTOPE_H_INCLUDED
+-#define INTSINPOLYTOPE_H_INLCUDED
++#define INTSINPOLYTOPE_H_INCLUDED
+
+ #include "vektor.h"
+ #include "matrix.h"
diff --git a/debian/patches/series b/debian/patches/series
index caa6e3c..025ed37 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@ dont_forget_flags_debian.patch
fix_spelling_errors.patch
remove_failing_tests_on_32bits.patch
fix_GetUniqueGenerators_symmetry.patch
+fix_compilation_clang.diff
+fix_other_warnings_clang.diff
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 13bdd16..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-
diff --git a/debian/upstream b/debian/upstream/metadata
similarity index 100%
rename from debian/upstream
rename to debian/upstream/metadata
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gfan.git
More information about the debian-science-commits
mailing list