[Python-modules-commits] r26184 - in packages/pyqt5/trunk/debian (3 files)

[mitya57-guest at users.alioth.debian.org]

    Date: Thursday, October 17, 2013 @ 10:15:56
  Author: mitya57-guest
Revision: 26184

* Use dh_link for linking jquery.js in examples.
* Make sure dpkg build flags are actually applied.
* Pass --debug option to configure.py when doing debug builds.
* Link with --as-needed.

Modified:
  packages/pyqt5/trunk/debian/changelog
  packages/pyqt5/trunk/debian/pyqt5-doc.links
  packages/pyqt5/trunk/debian/rules

Modified: packages/pyqt5/trunk/debian/changelog
===================================================================
--- packages/pyqt5/trunk/debian/changelog	2013-10-17 08:51:36 UTC (rev 26183)
+++ packages/pyqt5/trunk/debian/changelog	2013-10-17 10:15:56 UTC (rev 26184)
@@ -3,11 +3,14 @@
   * New upstream bugfix release.
   * Add debian/get-orig-source.sh and explain how to use it in
     README.source; add jquery_rc.py to list of non-free files.
-  * Remove symlink to jquery in clean target.
+  * Use dh_link for linking jquery.js in examples.
   * Install QOpenGLFunctions libraries in python3-pyqt5.qtopengl package.
   * Call dh_install with --fail-missing option.
   * Do not install Windows-specific activeqt examples.
   * Add new package for QtSerialPort module.
+  * Make sure dpkg build flags are actually applied.
+  * Pass --debug option to configure.py when doing debug builds.
+  * Link with --as-needed.
 
  -- Dmitry Shachnev <mitya57 at gmail.com>  Tue, 15 Oct 2013 17:59:27 +0400
 

Modified: packages/pyqt5/trunk/debian/pyqt5-doc.links
===================================================================
--- packages/pyqt5/trunk/debian/pyqt5-doc.links	2013-10-17 08:51:36 UTC (rev 26183)
+++ packages/pyqt5/trunk/debian/pyqt5-doc.links	2013-10-17 10:15:56 UTC (rev 26184)
@@ -1 +1 @@
-#usr/share/doc/pyqt5-doc/html/_static/jquery.js  /usr/share/doc/pyqt5-doc/examples/webkit/fancybrowser/jquery.min.js
+usr/share/doc/pyqt5-doc/html/_static/jquery.js usr/share/doc/pyqt5-doc/examples/webkit/fancybrowser/jquery.min.js

Modified: packages/pyqt5/trunk/debian/rules
===================================================================
--- packages/pyqt5/trunk/debian/rules	2013-10-17 08:51:36 UTC (rev 26183)
+++ packages/pyqt5/trunk/debian/rules	2013-10-17 10:15:56 UTC (rev 26184)
@@ -26,7 +26,7 @@
 	LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 endif
 
-LDFLAGS += -Wl,-O1
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
 
 ifeq ($(DEB_BUILD_ARCH),alpha)
 	LDFLAGS += -Wl,--no-relax
@@ -44,9 +44,9 @@
 	-q /usr/bin/qmake -c -j $(SPLIT) \
 	LIBDIR_QT=/usr/lib STRIP="" MOC=/usr/bin/moc \
 	LIBS_OPENGL="" LIBS_X11="" LIBS_THREAD="" \
-	CFLAGS="" CFLAGS_RELEASE="${CFLAGS} ${CPPFLAGS}" \
-	LFLAGS="" CXXFLAGS_RELEASE="${CXXFLAGS} ${CPPFLAGS}" \
-	LFLAGS_RELEASE="${LDFLAGS}"
+	QMAKE_CFLAGS+="${CFLAGS} ${CPPFLAGS}" \
+	QMAKE_CXXFLAGS+="${CXXFLAGS} ${CPPFLAGS}" \
+	QMAKE_LFLAGS+="${LDFLAGS}"
 
 
 .PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
@@ -57,8 +57,6 @@
 	dh_testdir
 	mkdir -p build-$*
 	ln -s ../sip build-$*/sip
-	ln -s /usr/share/javascript/sphinxdoc/1.0/jquery.js \
-		examples/webkit/fancybrowser/jquery.min.js
 	cd build-$* && python$* ../configure.py $(SHARED_CONFIGURE_OPTIONS) \
 			-m $(shell python$*-config --configdir) \
 			-d /usr/lib/python$*/dist-packages \
@@ -74,7 +72,7 @@
 			-m $(shell python$*-dbg-config --configdir) \
 			-l /usr/include/python$*$(if $(filter 3.2, $*),dmu,dm) \
 			-d /usr/lib/python$*/dist-packages \
-			--no-designer-plugin --no-qml-plugin
+			--debug --no-designer-plugin --no-qml-plugin
 	touch $@
 
 
@@ -99,6 +97,7 @@
 	dh_installdirs -i
 	dh_install -i --fail-missing
 	dh_installexamples -Xactiveqt -i
+	dh_link -i
 	# Use python3 shebangs and regenerate resource files
 	cd $(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/examples/; \
 		find . -name '*.py' -exec sed -i 's/\/env python/\/python3/g' {} +; \
@@ -169,7 +168,7 @@
 	rm -rf $(PYTHON3S:%=build-%) $(PYTHON3S:%=dbg-build-%)
 	find . -type d -name __pycache__ | xargs rm -rf
 	cd sip; rm -rf Qt opengl_types.sip pyqt-gpl.sip5
-	rm -f examples/webkit/fancybrowser/jquery.min.js
+	rm -f examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir
 	dh_clean
 
 # Must not depend on anything. This is to be called by
@@ -186,7 +185,6 @@
 	$(CURDIR)/debian/pyqt5-doc/usr/share/doc/pyqt5-doc/html
 	dh_sphinxdoc
 endif
-	dh_link
 	dh_sip3
 ifeq (,$(findstring -i, $(DH_OPTIONS)))
 	DH_OPTIONS= dh_strip -ppyqt5-dev-tools