[SCM] Package for Analyzing Lattice Polytopes branch, master, updated. upstream/2.1-2-g58bbc64

[Julien Puydt]

The following commit has been merged in the master branch:
commit 58bbc64e8928cb2281c8579c88791cea9cde9c22
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Sat Jun 16 11:46:36 2012 +0200

    Use dpkg-buildflags and fix the formatting problems which then arise

diff --git a/debian/patches/dpkg-buildflags.patch b/debian/patches/dpkg-buildflags.patch
new file mode 100644
index 0000000..e050ac9
--- /dev/null
+++ b/debian/patches/dpkg-buildflags.patch
@@ -0,0 +1,18 @@
+Author: Julien Puydt <julien.puydt at laposte.net>
+Description: Make the compilation use dpkg-buildflags
+Forwarded: no
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 4cac75f..fa8f7ec 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -17,7 +17,8 @@ MORI_OBJ= $(MORI_SRC:.c=.o)
+ 
+ CC=gcc
+ 
+-CFLAGS=-O3 -g -W -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS=`dpkg-buildflags --get CFLAGS`
++#CFLAGS=-O3 -g -W -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ # CFLAGS=-O3 -g				      # add -g for GNU debugger gdb
+ # CFLAGS=-Ofast -O3 -mips4 -n32		      # SGI / 32 bit
+ # CFLAGS=-Ofast -O3 -mips4 -64                # SGI / 64 bit
diff --git a/debian/patches/fix-format-errors.patch b/debian/patches/fix-format-errors.patch
new file mode 100644
index 0000000..afbf219
--- /dev/null
+++ b/debian/patches/fix-format-errors.patch
@@ -0,0 +1,52 @@
+Author: Julien Puydt <julien.puydt at laposte.net>
+Description: Fix format errors (arising from the use of dpkg-buildflags)
+Forwarded: not-needed
+
+diff --git a/Subadd.c b/Subadd.c
+index 7403bb5..8f124f2 100644
+--- a/Subadd.c
++++ b/Subadd.c
+@@ -95,7 +95,7 @@ void Init_New_List(NF_List *S)
+ NF_List *AuxNFLptr=NULL;		/* dirty trick for Xmin Xmax Xdif */
+ void Init_NF_List(NF_List *L)
+ {    
+-     L->TIME= L->SAVE= time(NULL); printf(ctime(&L->TIME)); L->CLOCK= clock();
++     L->TIME= L->SAVE= time(NULL); printf("%s\n",ctime(&L->TIME)); L->CLOCK= clock();
+      L->IP_Time = L->NF_Time = 0;  L->d = L->nNF = L->nIP = L->nSLNF = 0;
+      
+      Init_FInfoList(&L->In);	if(*L->iname) Read_In_File(L);	
+diff --git a/Subdb.c b/Subdb.c
+index ed70646..47228b1 100644
+--- a/Subdb.c
++++ b/Subdb.c
+@@ -1750,7 +1750,7 @@ void V_Sublat_Polys(char mr,char *dbin,char *polyi,char *polyo,
+ 	}
+      }	if(*dbin) Close_DB(DB);
+      printf("max_order=%d\n", max_order); Write_List_2_File(polyo,_L); 
+-     _L->TIME=time(NULL); printf(ctime(&_L->TIME));
++     _L->TIME=time(NULL); printf("%s\n",ctime(&_L->TIME));
+      free(_L);
+ }
+ void VPHM_Sublat_Polys(char sFlag,char mr,char *dbin,char *polyi,char *polyo, 
+diff --git a/Subpoly.c b/Subpoly.c
+index 0198ddb..5086872 100644
+--- a/Subpoly.c
++++ b/Subpoly.c
+@@ -866,7 +866,7 @@ void Do_the_Classification(CWS *W, PolyPointList *P, /* char *fn, */
+ 
+   if(rFlag==0) Write_List_2_File(polyo,_NFL); 
+   _NFL->TIME=time(NULL); 
+-  printf(ctime(&_NFL->TIME));
++  printf("%s\n",ctime(&_NFL->TIME));
+   free(_NFL);
+ }
+ 
+@@ -1189,7 +1189,7 @@ void Find_Sublat_Polys(char mFlag, char *dbin, char *polyi, char *polyo,
+     
+   printf("max_order=%d\n", max_order);
+   Write_List_2_File(polyo,_NFL); 
+-  _NFL->TIME=time(NULL); printf(ctime(&_NFL->TIME));
++  _NFL->TIME=time(NULL); printf("%s\n",ctime(&_NFL->TIME));
+   free(_NFL);
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..94f69fa
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+fix-format-errors.patch
+dpkg-buildflags.patch

-- 
Package for Analyzing Lattice Polytopes