r14264 - packages/trunk/bulletml/debian

[Peter De Wachter]

Author: pdewacht-guest
Date: 2013-06-17 21:04:27 +0000 (Mon, 17 Jun 2013)
New Revision: 14264

Modified:
   packages/trunk/bulletml/debian/changelog
   packages/trunk/bulletml/debian/compat
   packages/trunk/bulletml/debian/control
   packages/trunk/bulletml/debian/copyright
   packages/trunk/bulletml/debian/rules
Log:
bulletml: packaging cleanups


Modified: packages/trunk/bulletml/debian/changelog
===================================================================
--- packages/trunk/bulletml/debian/changelog	2013-06-17 16:26:28 UTC (rev 14263)
+++ packages/trunk/bulletml/debian/changelog	2013-06-17 21:04:27 UTC (rev 14264)
@@ -1,3 +1,13 @@
+bulletml (0.0.6-6) UNRELEASED; urgency=low
+
+  * Cleaned up packaging
+    - Switch to debhelper 9
+    - Remove quilt dependency
+    - Enable hardening flags
+  * Upgraded Standards-Version to 3.9.4
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Mon, 17 Jun 2013 22:55:36 +0200
+
 bulletml (0.0.6-5) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/bulletml/debian/compat
===================================================================
--- packages/trunk/bulletml/debian/compat	2013-06-17 16:26:28 UTC (rev 14263)
+++ packages/trunk/bulletml/debian/compat	2013-06-17 21:04:27 UTC (rev 14264)
@@ -1 +1 @@
-5
+9

Modified: packages/trunk/bulletml/debian/control
===================================================================
--- packages/trunk/bulletml/debian/control	2013-06-17 16:26:28 UTC (rev 14263)
+++ packages/trunk/bulletml/debian/control	2013-06-17 21:04:27 UTC (rev 14264)
@@ -2,13 +2,12 @@
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 5), quilt, bison
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), bison
+Standards-Version: 3.9.4
 Section: libs
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bulletml/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/bulletml/?op=log
+Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/bulletml/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/bulletml/
 Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html
-DM-Upload-Allowed: yes
 
 Package: libbulletml-dev
 Section: libdevel

Modified: packages/trunk/bulletml/debian/copyright
===================================================================
--- packages/trunk/bulletml/debian/copyright	2013-06-17 16:26:28 UTC (rev 14263)
+++ packages/trunk/bulletml/debian/copyright	2013-06-17 21:04:27 UTC (rev 14264)
@@ -116,7 +116,7 @@
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 
 calc.cpp:
@@ -143,7 +143,7 @@
     in version 1.24 of Bison.
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
 
 debian/doc: 

Modified: packages/trunk/bulletml/debian/rules
===================================================================
--- packages/trunk/bulletml/debian/rules	2013-06-17 16:26:28 UTC (rev 14263)
+++ packages/trunk/bulletml/debian/rules	2013-06-17 21:04:27 UTC (rev 14264)
@@ -3,46 +3,33 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -g -Wall -ansi -pedantic
+include /usr/share/dpkg/buildflags.mk
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-patch: patch-stamp
-patch-stamp:
-	dh_testdir
-	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	rm -f src/calc.cpp #needs to be regenerated from src/calc.yy
-	touch $@
-
 build: build-stamp
-build-stamp: patch-stamp 
+build-stamp:
 	dh_testdir
+	rm -f src/calc.cpp #needs to be regenerated from src/calc.yy
 	rm -f src/*.o src/*/*.o
-	$(MAKE) -C src CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" libbulletml.a
+	$(MAKE) -C src CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS)" libbulletml.a
 	rm -f src/*.o src/*/*.o
-	$(MAKE) -C src CFLAGS="$(CFLAGS) -fPIC -fpic" CXXFLAGS="$(CFLAGS) -fPIC -fpic" \
-		LDFLAGS="-Wl,-z,defs" libbulletml.so
+	$(MAKE) -C src CXXFLAGS="$(CXXFLAGS) $(CPPFLAGS) -fPIC -fpic" \
+		LDFLAGS="$(LDFLAGS) -Wl,-z,defs" libbulletml.so
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp patch-stamp
+	rm -f build-stamp
 	$(MAKE) -C src clean
 	rm -f src/*.so src/*.so.* src/*.o
 	rm -f src/bulletml.d
 	rm -f src/calc.cpp
-	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	#$(MAKE) -C src DESTDIR=$(CURDIR)/debian/tmp install
 
@@ -80,4 +67,4 @@
 	rm d_cpp.tar.bz2 libbulletml-0.0.6.tar.bz2
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch get-orig-source
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source