[Python-modules-commits] r22264 - in packages/sip4/trunk/debian (changelog control rules)

[kitterman at users.alioth.debian.org]

    Date: Saturday, June 23, 2012 @ 16:21:31
  Author: kitterman
Revision: 22264

* Install sip.h for python3-sip-dev in the correct directories
* Add support for dpkg-buildflags in debian/rules
  - Build dbg packages -02 instead of -00 as a consequence
  - Add build-depends on dpkg-dev (>= 1.16.1~)
* Add missing build-depends on flex
* Drop unneeded depends on libjs-jquery for python3-sip-dev

Modified:
  packages/sip4/trunk/debian/changelog
  packages/sip4/trunk/debian/control
  packages/sip4/trunk/debian/rules

Modified: packages/sip4/trunk/debian/changelog
===================================================================
--- packages/sip4/trunk/debian/changelog	2012-06-23 16:20:12 UTC (rev 22263)
+++ packages/sip4/trunk/debian/changelog	2012-06-23 16:21:31 UTC (rev 22264)
@@ -1,3 +1,14 @@
+sip4 (4.13.3-2) unstable; urgency=low
+
+  * Install sip.h for python3-sip-dev in the correct directories
+  * Add support for dpkg-buildflags in debian/rules
+    - Build dbg packages -02 instead of -00 as a consequence
+    - Add build-depends on dpkg-dev (>= 1.16.1~)
+  * Add missing build-depends on flex
+  * Drop unneeded depends on libjs-jquery for python3-sip-dev
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 22 Jun 2012 11:54:27 -0400
+
 sip4 (4.13.3-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/sip4/trunk/debian/control
===================================================================
--- packages/sip4/trunk/debian/control	2012-06-23 16:20:12 UTC (rev 22263)
+++ packages/sip4/trunk/debian/control	2012-06-23 16:21:31 UTC (rev 22264)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Torsten Marek <shlomme at debian.org>, Michael Casadevall <mcasadevall at debian.org>, Scott Kitterman <scott at kitterman.com>
-Build-Depends: debhelper (>= 7), python-all-dev (>= 2.6.7-3~), python-all-dbg, python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg
+Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 7), python-all-dev (>= 2.6.7-3~), python-all-dbg, python3-all-dev (>= 3.2.2~rc1-1~), python3-all-dbg, flex
 Standards-Version: 3.9.3
 Homepage: http://www.riverbankcomputing.co.uk/software/sip/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sip4/trunk
@@ -107,7 +107,7 @@
 Package: python3-sip-dev
 Architecture: any
 Section: python
-Depends: ${python:Depends}, python3-sip (= ${binary:Version}), python3-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Depends: ${python:Depends}, python3-sip (= ${binary:Version}), python3-dev, ${shlibs:Depends}, ${misc:Depends}
 Recommends: python3-sip (>= ${source:Version})
 Suggests: python-sip-doc
 Description: Python 3/C++ bindings generator development files

Modified: packages/sip4/trunk/debian/rules
===================================================================
--- packages/sip4/trunk/debian/rules	2012-06-23 16:20:12 UTC (rev 22263)
+++ packages/sip4/trunk/debian/rules	2012-06-23 16:21:31 UTC (rev 22264)
@@ -10,10 +10,16 @@
 INSTDIR=$(CURDIR)/debian
 
 CFLAGS=
+CPPFLAGS=
+CXXFLAGS=
+LDFLAGS=
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0 -g
 else
-	CFLAGS += -O2 -g
+	CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
+	CPPFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+	CXXFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
+	LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 endif
 
 PYTHONS	:= $(shell pyversions -vr) $(shell py3versions -vd)
@@ -37,7 +43,9 @@
 	cd build-$* \
 		&& python$* ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*) \
-			-u STRIP="" CFLAGS="${CFLAGS}" CFLAGS_RELEASE="" CXXFLAGS="${CFLAGS}" CXXFLAGS_RELEASE=""
+			-u STRIP="" CFLAGS="${CFLAGS} ${CPPFLAGS}" CFLAGS_RELEASE="" \
+			CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" CXXFLAGS_RELEASE="" \
+			LFLAGS="${LDFLAGS}" LFLAGS_RELEASE=""
 	touch $@
 
 dbg-build-%/configure-stamp:
@@ -47,7 +55,9 @@
 		&& python$*-dbg ../configure.py \
 			-d /usr/lib/python$*/$(call py_sitename,$*) \
 			-e /usr/include/python$*_d \
-			-u CFLAGS="-O0 -g" CFLAGS_RELEASE="" CXXFLAGS="-O0 -g" CXXFLAGS_RELEASE="" STRIP=""
+			-u CFLAGS="${CFLAGS} ${CPPFLAGS}" CFLAGS_RELEASE="" \
+			CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" CXXFLAGS_RELEASE="" \
+                        LFLAGS="${LDFLAGS}" LFLAGS_RELEASE="" STRIP="" 
 	touch $@
 
 
@@ -107,11 +117,11 @@
 	install -m 644 -o root -g root debian/sipconfig_py3.py debian/python3-sip/usr/lib/python3.$*/dist-packages/sipconfig.py
 	install -m 644 -o root -g root build-3.$*/sipconfig.py debian/python3-sip/usr/lib/python3.$*/dist-packages/sipconfig_nd.py
 	install -m 644 -o root -g root dbg-build-3.$*/sipconfig.py debian/python3-sip-dbg/usr/lib/python3.$*/dist-packages/sipconfig_d.py
-	mkdir -p debian/python3-sip-dev/usr/include/python3.$*
-	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-dev/usr/include/python3.$*/
-	mkdir -p debian/python3-sip-dev/usr/include/python3.$*_d
-	ln -s ../python3.$*/sip.h \
-	    debian/python3-sip-dev/usr/include/python3.$*_d/sip.h
+	mkdir -p debian/python3-sip-dev/usr/include/python3.$*mu
+	install -m 644 -o root -g root siplib/sip.h debian/python3-sip-dev/usr/include/python3.$*mu/
+	mkdir -p debian/python3-sip-dev/usr/include/python3.$*dmu
+	ln -s ../python3.$*mu/sip.h \
+	    debian/python3-sip-dev/usr/include/python3.$*dmu/sip.h
 	mkdir -p debian/python3-sip-dev/usr/lib/python3.$*/dist-packages
 	install -m 644 -o root -g root sipdistutils.py debian/python3-sip-dev/usr/lib/python3.$*/dist-packages