Author: apo-guest Date: 2014-06-03 09:08:41 +0000 (Tue, 03 Jun 2014) New Revision: 15122
Added: packages/trunk/opencity/debian/patches/no-pedantic-errors.patch Modified: packages/trunk/opencity/debian/changelog packages/trunk/opencity/debian/control packages/trunk/opencity/debian/menu packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch packages/trunk/opencity/debian/patches/series packages/trunk/opencity/debian/rules Log: Debian release 0.0.6.4stable-4 Modified: packages/trunk/opencity/debian/changelog =================================================================== --- packages/trunk/opencity/debian/changelog 2014-05-30 17:26:44 UTC (rev 15121) +++ packages/trunk/opencity/debian/changelog 2014-06-03 09:08:41 UTC (rev 15122) @@ -1,3 +1,17 @@ +opencity (0.0.6.4stable-4) unstable; urgency=medium + + * Add no-pedantic-errors.patch. + - Remove -pedantic-errors compiler option to avoid a FTBFS. + (Closes: #750330) + * debian/menu: Change section from Action to Simulation. + * Build with dh-autoreconf instead of autotools-dev. + * Update remove-use-of-embedded-tinyxml.patch and really use the tinyxml + system shared library. + * debian/rules: Add CPPFLAGS also to CFLAGS to ensure that all hardening + build flags are passed to binreloc and pngfuncs. + + -- Markus Koschany <[email protected]> Mon, 02 Jun 2014 23:54:16 +0200 + opencity (0.0.6.4stable-3) unstable; urgency=medium * Install opencity.xpm in arch-independent opencity-data package. Modified: packages/trunk/opencity/debian/control =================================================================== --- packages/trunk/opencity/debian/control 2014-05-30 17:26:44 UTC (rev 15121) +++ packages/trunk/opencity/debian/control 2014-06-03 09:08:41 UTC (rev 15122) @@ -5,7 +5,7 @@ Uploaders: Markus Koschany <[email protected]> Build-Depends: - autotools-dev, + dh-autoreconf, debhelper (>= 9), libglu1-mesa-dev, libsdl-image1.2-dev, Modified: packages/trunk/opencity/debian/menu =================================================================== --- packages/trunk/opencity/debian/menu 2014-05-30 17:26:44 UTC (rev 15121) +++ packages/trunk/opencity/debian/menu 2014-06-03 09:08:41 UTC (rev 15122) @@ -1,5 +1,5 @@ ?package(opencity):needs="X11" \ - section="Games/Action" \ + section="Games/Simulation" \ title="OpenCity" \ longtitle="OpenCity - 3D city simulator game" \ command="/usr/games/opencity" \ Added: packages/trunk/opencity/debian/patches/no-pedantic-errors.patch =================================================================== --- packages/trunk/opencity/debian/patches/no-pedantic-errors.patch (rev 0) +++ packages/trunk/opencity/debian/patches/no-pedantic-errors.patch 2014-06-03 09:08:41 UTC (rev 15122) @@ -0,0 +1,23 @@ +From: Markus Koschany <[email protected]> +Date: Mon, 2 Jun 2014 23:50:54 +0200 +Subject: no pedantic errors + +Forwarded: https://sourceforge.net/p/opencity/bugs/50/ +Bug: https://bugs.debian.org/750330 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1a0590d..31c8130 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -199,7 +199,7 @@ dnl =========================================================================== + dnl Set the compiler and the linker options + dnl =========================================================================== + dnl Set C / C++ compiler options +-CPPFLAGS="-Wall -Wmissing-braces -Wparentheses -pedantic-errors $CPPFLAGS" ++CPPFLAGS="-Wall -Wmissing-braces -Wparentheses $CPPFLAGS" + + dnl Set more C / C++ compiler options + CPPFLAGS="-I$with_gl_prefix/include $enable_gprof $enable_debug $CPPFLAGS" Modified: packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch =================================================================== --- packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch 2014-05-30 17:26:44 UTC (rev 15121) +++ packages/trunk/opencity/debian/patches/remove-use-of-embedded-tinyxml.patch 2014-06-03 09:08:41 UTC (rev 15122) @@ -5,14 +5,18 @@ Forwarded: https://sourceforge.net/p/opencity/bugs/49/ --- configure | 3 --- + configure.ac | 1 - + src/Makefile.am | 7 +++---- src/Makefile.in | 11 +++++------ + src/tinyxpath/Makefile.am | 3 +-- src/tinyxpath/Makefile.in | 2 -- src/tinyxpath/node_set.cpp | 8 ++++---- src/tinyxpath/xpath_processor.cpp | 10 +++++----- src/tinyxpath/xpath_stream.h | 1 - src/zen.cpp | 2 +- + viewer/Makefile.am | 3 +-- viewer/Makefile.in | 5 ++--- - 8 files changed, 17 insertions(+), 25 deletions(-) + 12 files changed, 22 insertions(+), 34 deletions(-) diff --git a/configure b/configure index 233a971..43c44ad 100755 @@ -35,6 +39,54 @@ "src/tinyxpath/Makefile") CONFIG_FILES="$CONFIG_FILES src/tinyxpath/Makefile" ;; "src/triangulation/Makefile") CONFIG_FILES="$CONFIG_FILES src/triangulation/Makefile" ;; "viewer/Makefile") CONFIG_FILES="$CONFIG_FILES viewer/Makefile" ;; +diff --git a/configure.ac b/configure.ac +index 1da0720..1a0590d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -240,7 +240,6 @@ AC_CONFIG_FILES([src/networking/Makefile]) + AC_CONFIG_FILES([src/pngfuncs/Makefile]) + AC_CONFIG_FILES([src/simulator/Makefile]) + AC_CONFIG_FILES([src/structure/Makefile]) +-AC_CONFIG_FILES([src/tinyxml/Makefile]) + AC_CONFIG_FILES([src/tinyxpath/Makefile]) + AC_CONFIG_FILES([src/triangulation/Makefile]) + AC_CONFIG_FILES([viewer/Makefile]) +diff --git a/src/Makefile.am b/src/Makefile.am +index 3fe6aab..097af33 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = binreloc enum mapgen mas model networking pngfuncs simulator structure tinyxml tinyxpath triangulation ++SUBDIRS = binreloc enum mapgen mas model networking pngfuncs simulator structure tinyxpath triangulation + AM_CPPFLAGS = \ + -I@top_srcdir@/src/ \ + -I@top_srcdir@/src/binreloc/ \ +@@ -10,7 +10,6 @@ AM_CPPFLAGS = \ + -I@top_srcdir@/src/pngfuncs/ \ + -I@top_srcdir@/src/simulator/ \ + -I@top_srcdir@/src/structure/ \ +- -I@top_srcdir@/src/tinyxml/ \ + -I@top_srcdir@/src/tinyxpath/ \ + -I@top_srcdir@/src/triangulation/ \ + -DDATADIR=\"@datadir@\" \ +@@ -43,7 +42,7 @@ networking/libnet.a \ + pngfuncs/libpngfuncs.a \ + simulator/libsim.a \ + structure/libstruct.a \ +-tinyxml/libtinyxml.a \ ++-ltinyxml \ + tinyxpath/libtinyxpath.a \ + triangulation/libtriangulation.a + +@@ -135,7 +134,7 @@ networking/libnet.a \ + pngfuncs/libpngfuncs.a \ + simulator/libsim.a \ + structure/libstruct.a \ +-tinyxml/libtinyxml.a \ ++-ltinyxml \ + tinyxpath/libtinyxpath.a \ + triangulation/libtriangulation.a + diff --git a/src/Makefile.in b/src/Makefile.in index c593df3..76c4562 100644 --- a/src/Makefile.in @@ -92,6 +144,17 @@ tinyxpath/libtinyxpath.a \ triangulation/libtriangulation.a +diff --git a/src/tinyxpath/Makefile.am b/src/tinyxpath/Makefile.am +index b50e9bb..dec6eef 100644 +--- a/src/tinyxpath/Makefile.am ++++ b/src/tinyxpath/Makefile.am +@@ -1,5 +1,4 @@ +-AM_CPPFLAGS = \ +- -I@top_srcdir@/src/tinyxml/ ++AM_CPPFLAGS = + + + noinst_LIBRARIES = libtinyxpath.a diff --git a/src/tinyxpath/Makefile.in b/src/tinyxpath/Makefile.in index afed569..d379283 100644 --- a/src/tinyxpath/Makefile.in @@ -219,6 +282,27 @@ #include "SimpleOpt.h" // Simple command line argument parser // Standard headers +diff --git a/viewer/Makefile.am b/viewer/Makefile.am +index 511fa24..b74ec22 100644 +--- a/viewer/Makefile.am ++++ b/viewer/Makefile.am +@@ -6,7 +6,6 @@ AM_CPPFLAGS = \ + -I@top_srcdir@/src/networking/ \ + -I@top_srcdir@/src/pngfuncs/ \ + -I@top_srcdir@/src/structure/ \ +- -I@top_srcdir@/src/tinyxml/ \ + -I@top_srcdir@/src/tinyxpath/ + + +@@ -17,7 +16,7 @@ viewer_LDADD = \ + ../src/pngfuncs/libpngfuncs.a \ + ../src/structure/libstruct.a \ + ../src/triangulation/libtriangulation.a \ +- ../src/tinyxml/libtinyxml.a \ ++ -ltinyxml \ + ../src/tinyxpath/libtinyxpath.a + + diff --git a/viewer/Makefile.in b/viewer/Makefile.in index a66372d..e0d0b7e 100644 --- a/viewer/Makefile.in Modified: packages/trunk/opencity/debian/patches/series =================================================================== --- packages/trunk/opencity/debian/patches/series 2014-05-30 17:26:44 UTC (rev 15121) +++ packages/trunk/opencity/debian/patches/series 2014-06-03 09:08:41 UTC (rev 15122) @@ -1,2 +1,3 @@ remove-use-of-embedded-tinyxml.patch gcc-4.7-fixes.patch +no-pedantic-errors.patch Modified: packages/trunk/opencity/debian/rules =================================================================== --- packages/trunk/opencity/debian/rules 2014-05-30 17:26:44 UTC (rev 15121) +++ packages/trunk/opencity/debian/rules 2014-06-03 09:08:41 UTC (rev 15122) @@ -1,10 +1,11 @@ #!/usr/bin/make -f export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) -CXXFLAGS+=$(CPPFLAGS) +CXXFLAGS +=$(CPPFLAGS) +CFLAGS +=$(CPPFLAGS) %: - dh $@ --parallel --with autotools_dev + dh $@ --parallel --with autoreconf override_dh_auto_configure: dh_auto_configure -- \ _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
