r15120 - packages/trunk/box2d/debian

[Markus Koschany]

Author: apo-guest
Date: 2014-05-30 17:26:21 +0000 (Fri, 30 May 2014)
New Revision: 15120

Modified:
   packages/trunk/box2d/debian/changelog
   packages/trunk/box2d/debian/copyright
   packages/trunk/box2d/debian/libbox2d-dev.install
   packages/trunk/box2d/debian/rules
   packages/trunk/box2d/debian/watch
Log:
Debian release 2.3.1+ds-1

New upstream bug fix release
Add new licenses, Apache-2.0 and Public Domain
Update get-orig-source target
Fix watch file


Modified: packages/trunk/box2d/debian/changelog
===================================================================
--- packages/trunk/box2d/debian/changelog	2014-05-29 09:32:23 UTC (rev 15119)
+++ packages/trunk/box2d/debian/changelog	2014-05-30 17:26:21 UTC (rev 15120)
@@ -1,3 +1,16 @@
+box2d (2.3.1+ds-1) unstable; urgency=medium
+
+  * Imported Upstream version 2.3.1+ds.
+  * Fix debian/watch to determine new releases by parsing
+    the SVN tags of upstream's version control system.
+  * Update get-orig-source target for new release.
+  * dh_strip override: Replace $VER variable with 2.3.0 string.
+  * debian/copyright: Add new Public Domain and Apache 2.0 license.
+  * libbox2d-dev.install:
+    - Install *.cmake files in /usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Box2D.
+
+ -- Markus Koschany <apo at gambaru.de>  Fri, 30 May 2014 18:42:02 +0200
+
 box2d (2.3.0+ds-2) unstable; urgency=medium
 
   * Upload to unstable.

Modified: packages/trunk/box2d/debian/copyright
===================================================================
--- packages/trunk/box2d/debian/copyright	2014-05-29 09:32:23 UTC (rev 15119)
+++ packages/trunk/box2d/debian/copyright	2014-05-30 17:26:21 UTC (rev 15120)
@@ -4,9 +4,23 @@
 Source: http://code.google.com/p/box2d/
 
 Files: *
-Copyright: 2006-2013, Erin Catto and contributors
+Copyright: 2006-2014, Erin Catto and contributors
+           2009-2010, Mikko Mononen
 License: Zlib
 
+Files: Box2D/Testbed/Framework/stb_truetype.h
+Copyright: 2009-2013, Sean Barrett
+License: public-domain
+ This software is in the public domain. Where that dedication is not
+ recognized, you are granted a perpetual, irrevokable license to copy
+ and modify this file as you see fit.
+
+Files: Box2D/Build/Data/DroidSans.ttf
+Copyright: 2006, 2007, 2008, 2009, 2010 Google Corp.
+License: Apache-2.0
+ On Debian systems, the complete text of the Apache License Version 2.0
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
+
 Files: debian/*
 Copyright: 2009,      Miriam Ruiz <little_miry at yahoo.es>,
            2013,      Barry deFreese <bdefreese at debian.org>

Modified: packages/trunk/box2d/debian/libbox2d-dev.install
===================================================================
--- packages/trunk/box2d/debian/libbox2d-dev.install	2014-05-29 09:32:23 UTC (rev 15119)
+++ packages/trunk/box2d/debian/libbox2d-dev.install	2014-05-30 17:26:21 UTC (rev 15120)
@@ -1,5 +1,6 @@
 usr/include/*
 usr/lib/*/Box2D/*.cmake
+usr/lib/*/cmake/Box2D/*.cmake
 usr/lib/*/libBox2D.a
 usr/lib/*/libBox2D.so
 usr/lib/*/pkgconfig

Modified: packages/trunk/box2d/debian/rules
===================================================================
--- packages/trunk/box2d/debian/rules	2014-05-29 09:32:23 UTC (rev 15119)
+++ packages/trunk/box2d/debian/rules	2014-05-30 17:26:21 UTC (rev 15120)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-VER   = 2.3.0
+VER   = 2.3.1
 UURL  = http://box2d.googlecode.com/svn/tags/v
 PKG   = box2d
 DTYPE = +ds
@@ -39,7 +39,7 @@
 	$(RM) -r Box2D/Documentation/API
 
 override_dh_strip:
-	dh_strip --dbg-package=libbox2d$(VER)-dbg
+	dh_strip --dbg-package=libbox2d2.3.0-dbg
 
 ## https://wiki.debian.org/onlyjob/get-orig-source
 get-orig-source: $(PKG)_$(VER).orig.tar.xz
@@ -54,8 +54,8 @@
 	&& find . -depth -name ".svn" -exec $(RM) -r '{}' \; \
 	&& $(RM) -r -v \
 		Contributions \
-		Box2D/freeglut \
-		Box2D/glui
+		Box2D/glew \
+		Box2D/glfw
 	@echo "Packing..."
 	find -L "$(PKG)-$(VER)" -xdev -type f -print \
 		| sort | XZ_OPT="-7v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \

Modified: packages/trunk/box2d/debian/watch
===================================================================
--- packages/trunk/box2d/debian/watch	2014-05-29 09:32:23 UTC (rev 15119)
+++ packages/trunk/box2d/debian/watch	2014-05-30 17:26:21 UTC (rev 15120)
@@ -1,4 +1,4 @@
 version=3
-opts=downloadurlmangle=s%.*/([^/]*)/downloads/detail\?name=([^=&]*).*%http://$1.googlecode.com/files/$2%,filenamemangle=s/.*name=([^&]+).*/$1/,\
+opts=uversionmangle=s/(\d)[\/]$/$1$2/,\
 dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$// \
-http://code.google.com/p/box2d/downloads/list?can=1 .*=Box2D_v?(\d.*)\.(?:7z|tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|zip).*
+http://box2d.googlecode.com/svn/tags/v(\d.*)