[SCM] Packaging for gplanarity branch, master, updated. debian/17906-1-6-g917b3de

Vincent Legout vincent at legout.info
Sat Mar 24 17:41:26 UTC 2012


The following commit has been merged in the master branch:
commit 32b0a39125b62ea4d7333a58e39a8bee8d87b0ec
Author: Vincent Legout <vincent at legout.info>
Date:   Sat Mar 24 18:25:06 2012 +0100

    Add fix_makefile_flags.patch

diff --git a/debian/changelog b/debian/changelog
index f813cf6..51bc02a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ gplanarity (17906-2) unstable; urgency=low
   * Remove the DM-Upload-Allowed field
   * debian/rules: Enable all hardening flags
   * Use debhelper 9 (debian/compar, debhelper Build-Depends)
+  * fix_makefile_flags.patch: Added, fix how CFLAGS and LDFLAGS and handled
 
- -- Vincent Legout <vlegout at debian.org>  Sat, 24 Mar 2012 17:16:07 +0100
+ -- Vincent Legout <vlegout at debian.org>  Sat, 24 Mar 2012 18:22:05 +0100
 
 gplanarity (17906-1) unstable; urgency=low
 
diff --git a/debian/patches/fix_makefile_flags.patch b/debian/patches/fix_makefile_flags.patch
new file mode 100644
index 0000000..8ca6284
--- /dev/null
+++ b/debian/patches/fix_makefile_flags.patch
@@ -0,0 +1,26 @@
+Description: Correctly set CFLAGS an LDFLAGS
+Author: Vincent Legout <vlegout at debian.org>
+Last-Update: 2012-03-24
+
+Index: gplanarity/Makefile
+===================================================================
+--- gplanarity.orig/Makefile	2012-03-24 18:12:35.065260083 +0100
++++ gplanarity/Makefile	2012-03-24 18:17:44.309260796 +0100
+@@ -57,7 +57,7 @@
+ 
+ all-local:    
+ 	pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2" 1>/dev/null
+-	$(MAKE) target CFLAGS='-O2 -ffast-math $(GCF) $(ADD_DEF)'
++	$(MAKE) target CFLAGS='$(CFLAGS) -ffast-math $(GCF) $(ADD_DEF)'
+ 
+ all-recursive:
+ 	for D in $(SUBDIRS); do make -C $$D || exit 1; done
+@@ -91,7 +91,7 @@
+ 
+ target:  $(OBJ) 
+ 	./touch-version
+-	$(LD) $(OBJ) $(CFLAGS) -o $(TARGET) $(LIBS) $(LDF)
++	$(LD) $(OBJ) $(LDFLAGS) -o $(TARGET) $(LIBS) $(LDF)
+ 
+ install: install-local install-recursive
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 770647a..1b253d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 nls.patch
 makefile.patch
+fix_makefile_flags.patch

-- 
Packaging for gplanarity



More information about the Pkg-games-commits mailing list