r14253 - in packages/trunk/chipmunk/debian: . patches

Wed Jun 12 16:58:21 UTC 2013

Author: bdefreese
Date: 2013-06-12 16:58:21 +0000 (Wed, 12 Jun 2013)
New Revision: 14253

Added:
   packages/trunk/chipmunk/debian/libchipmunk0d3.install
Removed:
   packages/trunk/chipmunk/debian/libchipmunk0d1.install
Modified:
   packages/trunk/chipmunk/debian/README.source
   packages/trunk/chipmunk/debian/changelog
   packages/trunk/chipmunk/debian/compat
   packages/trunk/chipmunk/debian/control
   packages/trunk/chipmunk/debian/patches/build.patch
   packages/trunk/chipmunk/debian/patches/soname.patch
   packages/trunk/chipmunk/debian/rules
Log:
New upstream release and change to dh style rules

Modified: packages/trunk/chipmunk/debian/README.source
===================================================================

--- packages/trunk/chipmunk/debian/README.source	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/README.source	2013-06-12 16:58:21 UTC (rev 14253)
@@ -1 +1,18 @@
-See /usr/share/doc/quilt/README.source
+Upstream does not feel that chipmunk libs should be used as a shared lib.
+Here is a comment I received on the user forum when asking about SONAMEs:
+
+"It was removed quite some time ago. Compiling Chipmunk as a shared library 
+is *not* recommended. Since version differences can cause a slight change 
+in the simulation behavior due to floating point rounding issues, 
+substituting a dynamic library can cause things to break. 
+Secondly, I also don't specifically maintain binary compatibility 
+between Chipmunk versions. On occasions, I've added new fields to 
+structs for instance.
+.
+Instead, I've always recommended compiling Chipmunk as a static library. 
+Since it's such a tiny library and it's very unlikely to be running more 
+than one process using Chipmunk at a time, there is little to no benefit 
+of having it as a shared library anyway."
+
+As of right now, Debian is carrying a patch to set the SOVERSION and VERSION 
+in the cmake build files.

Modified: packages/trunk/chipmunk/debian/changelog
===================================================================
--- packages/trunk/chipmunk/debian/changelog	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/changelog	2013-06-12 16:58:21 UTC (rev 14253)
@@ -1,3 +1,20 @@
+chipmunk (6.1.5-1) unstable; urgency=low
+
+  [ Barry deFreese ]
+  * Add myself to uploaders.
+  * New upstream release. (Closes: #679199).
+  * Bump Debian SONAME to 0d3 for shared lib.
+    + Upstream feels it shouldn't be used as a shared lib.
+  * Add proper Vcs tags to debian/control.
+  * Update Homepage again.
+  * Drop build-dep on quilt since this is a source format 3.0 package.
+  * Bump debhelper build-dep and compat to 9.
+    + Change to dh style rules.
+  * Add hardening flags.
+  * Bump Standards Version to 3.9.4.
+
+ -- Barry deFreese <bdefreese at debian.org>  Wed, 12 Jun 2013 05:21:14 -0400
+
 chipmunk (6.1.1-1) UNRELEASED; urgency=low
 
   * Team upload.

Modified: packages/trunk/chipmunk/debian/compat
===================================================================
--- packages/trunk/chipmunk/debian/compat	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/compat	2013-06-12 16:58:21 UTC (rev 14253)
@@ -1 +1 @@
-7
+9

Modified: packages/trunk/chipmunk/debian/control
===================================================================
--- packages/trunk/chipmunk/debian/control	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/control	2013-06-12 16:58:21 UTC (rev 14253)
@@ -2,16 +2,18 @@
 Section: libs
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 7), cmake, dh-buildinfo, quilt,
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
+Build-Depends: debhelper (>= 9), cmake, dh-buildinfo,
  freeglut3-dev, libxmu-dev, libxi-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://chipmunk-physics.net/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/chipmunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/chipmunk/
 
 Package: chipmunk-dev
 Section: libdevel
 Architecture: any
-Depends: libchipmunk0d1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libchipmunk0d3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Fast and lightweight 2D rigid body physics library - devel
  Chipmunk is a simple, lightweight, fast and portable 2D rigid body physics
  library written in C. It's licensed under the unrestrictive, OSI approved
@@ -20,21 +22,23 @@
  .
  This package contains the development libraries and headers.
 
-Package: libchipmunk0d1
+Package: libchipmunk0d3
 Architecture: any
+Breaks: libchipmunk0d1 (<< 5.3.5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libchipmunk0d1-dbg (= ${binary:Version}), chipmunk-dev (= ${binary:Version})
+Suggests: libchipmunk0d3-dbg (= ${binary:Version}), chipmunk-dev (= ${binary:Version})
 Description: fast and lightweight 2D rigid body physics library in C
  Chipmunk is a simple, lightweight, fast and portable 2D rigid body physics
  library written in C. It's licensed under the unrestrictive, OSI approved
  MIT license. Its aim is to give 2D developers access the same quality of
  physics you find in newer 3D games.
 
-Package: libchipmunk0d1-dbg
+Package: libchipmunk0d3-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Depends: libchipmunk0d1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Breaks: libchipmunk0d1-dbg (<< 5.3.5)
+Depends: libchipmunk0d3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Fast and lightweight 2D rigid body physics library - debug
  Chipmunk is a simple, lightweight, fast and portable 2D rigid body physics
  library written in C. It's licensed under the unrestrictive, OSI approved

Deleted: packages/trunk/chipmunk/debian/libchipmunk0d1.install
===================================================================
--- packages/trunk/chipmunk/debian/libchipmunk0d1.install	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/libchipmunk0d1.install	2013-06-12 16:58:21 UTC (rev 14253)
@@ -1 +0,0 @@
-/usr/lib/*.so.*

Added: packages/trunk/chipmunk/debian/libchipmunk0d3.install
===================================================================
--- packages/trunk/chipmunk/debian/libchipmunk0d3.install	                        (rev 0)
+++ packages/trunk/chipmunk/debian/libchipmunk0d3.install	2013-06-12 16:58:21 UTC (rev 14253)
@@ -0,0 +1 @@
+/usr/lib/*.so.*

Modified: packages/trunk/chipmunk/debian/patches/build.patch
===================================================================
--- packages/trunk/chipmunk/debian/patches/build.patch	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/patches/build.patch	2013-06-12 16:58:21 UTC (rev 14253)
@@ -1,5 +1,9 @@
---- Chipmunk-5.3.4.orig/src/CMakeLists.txt
-+++ Chipmunk-5.3.4/src/CMakeLists.txt
+Description: On *nix like systems, math libs are not linked automatically.
+Author: Miriam Ruiz <little_miry at yahoo.es>
+Index: Chipmunk-6.1.5/src/CMakeLists.txt
+===================================================================
+--- Chipmunk-6.1.5.orig/src/CMakeLists.txt	2013-06-07 13:46:37.000000000 -0400
++++ Chipmunk-6.1.5/src/CMakeLists.txt	2013-06-07 13:53:39.000000000 -0400
 @@ -4,6 +4,12 @@
  
  include_directories(${chipmunk_SOURCE_DIR}/include/chipmunk)
@@ -13,7 +17,7 @@
  if(BUILD_SHARED)
    add_library(chipmunk SHARED
      ${chipmunk_source_files}
-@@ -13,6 +19,8 @@
+@@ -18,6 +24,8 @@
    install(TARGETS chipmunk RUNTIME DESTINATION lib LIBRARY DESTINATION lib)
  endif(BUILD_SHARED)
  
@@ -22,8 +26,10 @@
  if(BUILD_STATIC)
    add_library(chipmunk_static STATIC
      ${chipmunk_source_files}
---- Chipmunk-5.3.4.orig/Demo/CMakeLists.txt
-+++ Chipmunk-5.3.4/Demo/CMakeLists.txt
+Index: Chipmunk-6.1.5/Demo/CMakeLists.txt
+===================================================================
+--- Chipmunk-6.1.5.orig/Demo/CMakeLists.txt	2013-06-07 13:46:37.000000000 -0400
++++ Chipmunk-6.1.5/Demo/CMakeLists.txt	2013-06-07 13:55:20.000000000 -0400
 @@ -1,6 +1,12 @@
  find_package(OpenGL REQUIRED)
  find_package(GLUT REQUIRED)
@@ -44,4 +50,4 @@
 +  ${MATH_LIB}
  )
  
- file(GLOB chipmunk_demos_source_files "*.c")
+ if(NOT MSVC)

Modified: packages/trunk/chipmunk/debian/patches/soname.patch
===================================================================
--- packages/trunk/chipmunk/debian/patches/soname.patch	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/patches/soname.patch	2013-06-12 16:58:21 UTC (rev 14253)
@@ -1,11 +1,21 @@
---- chipmunk-5.3.4.orig/src/CMakeLists.txt
-+++ chipmunk-5.3.4/src/CMakeLists.txt
-@@ -15,7 +15,7 @@ if(BUILD_SHARED)
-     ${chipmunk_source_files}
-   )
+Description: Upstream does not use SONAME properly.
+ Upstream is not interested in maintaining binary compatibility 
+ or supporting shared libs properly.
+ .
+ Debian will continue to use improvised SONAMEs.
+Forwarded: http://chipmunk-physics.net/forum/viewtopic.php?f=3&t=2766
+Author: Miriam Ruiz <little_miry at yahoo.es>
+Last-Update: 2013-06-12
+Index: Chipmunk-6.1.5/src/CMakeLists.txt
+===================================================================
+--- Chipmunk-6.1.5.orig/src/CMakeLists.txt	2013-06-12 06:07:49.000000000 -0400
++++ Chipmunk-6.1.5/src/CMakeLists.txt	2013-06-12 06:08:31.000000000 -0400
+@@ -20,7 +20,7 @@
+     set_target_properties(chipmunk PROPERTIES LINKER_LANGUAGE CXX)
+   endif(MSVC)
    # set the lib's version number
--  set_target_properties(chipmunk PROPERTIES VERSION 5.3.4)
-+  set_target_properties(chipmunk PROPERTIES SOVERSION 0d1 VERSION 0d1.0.0)
+-  set_target_properties(chipmunk PROPERTIES VERSION 6.1.4)
++  set_target_properties(chipmunk PROPERTIES SOVERSION 0d3 VERSION 0d3.0.0)
    install(TARGETS chipmunk RUNTIME DESTINATION lib LIBRARY DESTINATION lib)
  endif(BUILD_SHARED)
  

Modified: packages/trunk/chipmunk/debian/rules
===================================================================
--- packages/trunk/chipmunk/debian/rules	2013-06-09 04:36:21 UTC (rev 14252)
+++ packages/trunk/chipmunk/debian/rules	2013-06-12 16:58:21 UTC (rev 14253)
@@ -3,15 +3,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-BUILD_TREE=$(CURDIR)/build-tree
+%:
+	dh $@ --buildsystem=cmake
 
-config: config-stamp
-config-stamp: 
-	dh_testdir
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make patch
-	# Perform an out-of-tree build to keep a clean source tree
-	mkdir $(BUILD_TREE)
-	cd $(BUILD_TREE) && cmake $(CURDIR)/ \
+override_dh_auto_configure:
+	dh_auto_configure -- \
 		-DBUILD_SHARED:BOOL=ON \
 		-DBUILD_STATIC:BOOL=ON \
 		-DBUILD_DEMOS:BOOL=ON \
@@ -21,58 +17,11 @@
 		--debug-output \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 		-DCMAKE_INSTALL_PREFIX:STRING="/usr" \
-		-DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \
+		-DCMAKE_C_FLAGS:STRING="$(CFLAGS) $(CPPFLAGS)" \
 		-DCMAKE_C_FLAGS_RELEASE:STRING="" \
 		-DCMAKE_C_FLAGS_DEBUG:STRING="" \
-		-DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined" \
-		-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined"
-	touch $@
+		-DCMAKE_SHARED_LINKER_FLAGS:STRING="-Wl,-z,defs -Wl,-z,relro -Wl,--as-needed -Wl,--no-undefined" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-z,defs -Wl,-z,relro -Wl,--as-needed -Wl,--no-undefined"
 
-build: build-stamp
-build-stamp: config
-	dh_testdir
-	cd $(BUILD_TREE); $(MAKE)
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp config-stamp
-	rm -fr $(BUILD_TREE)
-	[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make unpatch
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	cd $(BUILD_TREE); $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: install
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_install
-#	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip --dbg-package=libchipmunk0d1-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	[ ! -e /usr/bin/dh_buildinfo ] || dh_buildinfo
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: config build clean binary-indep binary-arch binary install 
+override_dh_strip:
+	dh_strip --dbg-package=libchipmunk0d3-dbg


