[Python-modules-commits] r3257 - in /packages/python-qt3/trunk/debian: changelog control patches/01_configure.dpatch rules
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Sat Sep 15 22:40:39 UTC 2007
Author: shlomme
Date: Sat Sep 15 22:40:38 2007
New Revision: 3257
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3257
Log:
* new upload to unstable
Modified:
packages/python-qt3/trunk/debian/changelog
packages/python-qt3/trunk/debian/control
packages/python-qt3/trunk/debian/patches/01_configure.dpatch
packages/python-qt3/trunk/debian/rules
Modified: packages/python-qt3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt3/trunk/debian/changelog?rev=3257&op=diff
==============================================================================
--- packages/python-qt3/trunk/debian/changelog (original)
+++ packages/python-qt3/trunk/debian/changelog Sat Sep 15 22:40:38 2007
@@ -1,8 +1,11 @@
-python-qt3 (3.17.3-3) UNRELEASED; urgency=low
+python-qt3 (3.17.3-3) unstable; urgency=low
* Handle DEB_BUILD_OPTIONS correctly.
-
- -- Torsten Marek <shlomme at debian.org> Sun, 12 Aug 2007 15:29:28 +0200
+ * Merge Ubuntu changes:
+ * Added debug packages.
+ * Better debian/rules file.
+
+ -- Torsten Marek <shlomme at debian.org> Sat, 15 Sep 2007 23:59:23 +0200
python-qt3 (3.17.3-2) unstable; urgency=low
Modified: packages/python-qt3/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt3/trunk/debian/control?rev=3257&op=diff
==============================================================================
--- packages/python-qt3/trunk/debian/control (original)
+++ packages/python-qt3/trunk/debian/control Sat Sep 15 22:40:38 2007
@@ -2,8 +2,8 @@
Section: python
Priority: optional
Maintainer: Ricardo Javier Cardenes Medina <rcardenes at debian.org>
-Uploaders: Torsten Marek <shlomme at debian.org>
-Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), libqt3-mt-dev (>= 3:3.3.4-4), qt3-dev-tools (>= 3:3.3.4-4), qt3-apps-dev (>= 3:3.3.4-4), sip4 (>= 4.7), python-sip4-dev (>= 4.7), libqscintilla-dev (>= 1.7-1), python-central (>= 0.5.8), dpatch
+Uploaders: Torsten Marek <shlomme at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 5.0.38), python-all-dev (>= 2.3.5-10), libqt3-mt-dev (>= 3:3.3.4-4), qt3-dev-tools (>= 3:3.3.4-4), qt3-apps-dev (>= 3:3.3.4-4), sip4 (>= 4.7), python-sip4-dev (>= 4.7), libqscintilla-dev (>= 1.7-1), python-central (>= 0.5.8), dpatch, python-sip4-dbg, python-all-dbg
XS-Python-Version: all
Standards-Version: 3.7.2
@@ -23,6 +23,17 @@
(types, etc), but usually you'll be able to write code pretty the
same way in both languages (with syntax differences, of course)
+Package: python-qt3-dbg
+Architecture: any
+Depends: python-qt3 (= ${binary:Version}), python-dbg, python-sip4-dbg (>= 4.7), ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
+Description: Qt3 bindings for Python (debug extension)
+ Python binding module that allows use of Qt X Window toolkit v3.
+ You can use it to create portable graphics-capable scripts (there
+ are PyQt versions for Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the python debug interpreter.
+
Package: python-qt3-gl
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2)
@@ -35,6 +46,18 @@
portable graphics-capable scripts (there are PyQt versions for
Linux, Windows and MacOS X).
+Package: python-qt3-gl-dbg
+Priority: extra
+Architecture: any
+Depends: python-qt3-gl (= ${binary:Version}), python-dbg, python-qt3-dbg (= ${binary:Version}), ${shlibs:Depends}
+Description: Qt3 OpenGL bindings for Python (debug extension)
+ Python binding module that allows use of the OpenGL facilities
+ offered by the Qt X Window toolkit v3. You can use it to create
+ portable graphics-capable scripts (there are PyQt versions for
+ Linux, Windows and MacOS X).
+ .
+ This package contains the extension built for the python debug interpreter.
+
Package: python-qtext
Architecture: any
Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version})
@@ -42,6 +65,16 @@
XB-Python-Version: ${python:Versions}
Description: Qt extensions for PyQt
PyQt Extensions. Contains:
+ .
+ * QScintilla: a featureful Qt source code editing component based
+ on Scintilla.
+
+Package: python-qtext-dbg
+Priority: extra
+Architecture: any
+Depends: python-qtext (= ${binary:Version}), python-dbg, python-qt3-dbg (= ${binary:Version}), ${shlibs:Depends}
+Description: Qt debug extensions for PyQt
+ PyQt debug Extensions. Contains:
.
* QScintilla: a featureful Qt source code editing component based
on Scintilla.
Modified: packages/python-qt3/trunk/debian/patches/01_configure.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt3/trunk/debian/patches/01_configure.dpatch?rev=3257&op=diff
==============================================================================
--- packages/python-qt3/trunk/debian/patches/01_configure.dpatch (original)
+++ packages/python-qt3/trunk/debian/patches/01_configure.dpatch Sat Sep 15 22:40:38 2007
@@ -4,9 +4,9 @@
## DP: Add object directory build support to configure.py
@DPATCH@
-diff -urNad python-qt3-3.17.2+snapshot20070701~/configure.py python-qt3-3.17.2+snapshot20070701/configure.py
---- python-qt3-3.17.2+snapshot20070701~/configure.py 2007-07-26 05:05:44.000000000 +0200
-+++ python-qt3-3.17.2+snapshot20070701/configure.py 2007-07-26 22:06:43.000000000 +0200
+diff -urNad python-qt3-3.17.3~/configure.py python-qt3-3.17.3/configure.py
+--- python-qt3-3.17.3~/configure.py 2007-07-30 17:51:21.000000000 +0200
++++ python-qt3-3.17.3/configure.py 2007-09-15 21:38:51.000000000 +0200
@@ -30,6 +30,15 @@
import sipconfig
@@ -22,18 +22,8 @@
+ return filename
# Initialise the globals.
- pyqt_version = 0x031100
-@@ -258,7 +267,8 @@
- }
-
- def code(self, extra_include_dirs, extra_lib_dir, extra_libs):
-- generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
-+ debian_cflags = os.environ.get("CXXFLAGS", "-O2")
-+ generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags=debian_cflags, extra_cflags=debian_cflags)
-
- if "qtext" in pyqt_modules:
- generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags)
-@@ -304,7 +314,8 @@
+ pyqt_version = 0x031103
+@@ -304,7 +313,8 @@
install_dir=opt_pyqtbindir,
console=1,
qt=1,
@@ -43,7 +33,7 @@
)
makefile.extra_defines.append("UIC")
-@@ -316,6 +327,14 @@
+@@ -316,6 +326,14 @@
if qt_version < 0x030100:
makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
@@ -58,7 +48,7 @@
makefile.generate()
tool_dirs.append("pyuic3")
-@@ -335,7 +354,8 @@
+@@ -335,7 +353,8 @@
install_dir=opt_pyqtbindir,
console=1,
qt=1,
@@ -68,7 +58,7 @@
)
makefile.extra_defines.append("QT_INTERNAL_XML")
-@@ -343,6 +363,14 @@
+@@ -343,6 +362,14 @@
if prof or "qtxml" not in pyqt_modules:
makefile.extra_defines.append("QT_MODULE_XML")
@@ -83,7 +73,7 @@
makefile.generate()
tool_dirs.append("pylupdate3")
elif qt_version >= 0x020000:
-@@ -599,7 +627,7 @@
+@@ -599,7 +626,7 @@
opengl is set if the application uses OpenGL.
"""
# Check the module's main .sip file exists.
@@ -92,7 +82,7 @@
sipconfig.inform("Checking to see if the %s module should be built..." % mname)
if check_class(incfile, ctor, define, include_dir, lib_dir, lib, opengl):
-@@ -898,10 +926,14 @@
+@@ -898,10 +925,14 @@
argv.append(buildfile)
argv.append("-I")
@@ -109,7 +99,7 @@
os.system(string.join(argv))
-@@ -916,7 +948,11 @@
+@@ -916,7 +947,11 @@
sipfiles = []
for s in glob.glob("sip/" + mname + "/*.sip"):
@@ -122,7 +112,7 @@
installs.append([sipfiles, os.path.join(pyqt.sip_dir(), mname)])
-@@ -1418,7 +1454,7 @@
+@@ -1418,7 +1453,7 @@
).generate()
# Install the configuration module.
Modified: packages/python-qt3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-qt3/trunk/debian/rules?rev=3257&op=diff
==============================================================================
--- packages/python-qt3/trunk/debian/rules (original)
+++ packages/python-qt3/trunk/debian/rules Sat Sep 15 22:40:38 2007
@@ -2,6 +2,8 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+export DH_OPTIONS
include /usr/share/dpatch/dpatch.make
@@ -14,46 +16,60 @@
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CXXFLAGS += -O0
else
- CXXFLAGS += -O2
+ CXXFLAGS += -O1
endif
PYTHONS := $(shell pyversions -vr debian/control)
-configure: configure-stamp
-configure-stamp: patch-stamp
+GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
+ifneq (,$(filter $(GCCVER),4.2 4.3))
+ SPLIT=40
+else
+ SPLIT=10
+endif
+
+.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
+
+configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
+build-%/configure-stamp: patch-stamp
dh_testdir
- rm -f failed-stamp
- for version in ${PYTHONS};\
- do\
- mkdir -p build-$$version;\
- cd build-$$version;\
- echo yes | python$$version ../configure.py \
- -c -n /usr/include/qscintilla \
- -o /usr/lib -u -j 4 \
- -d /usr/lib/python$$version/site-packages \
- -l /usr/include/python$$version \
- -l /usr/lib/python$$version/config \
- -v /usr/share/sip/qt CXXFLAGS_RELEASE="${CXXFLAGS}" STRIP="" \
- || touch ../failed-stamp;\
- cd ..;\
- sed -i -e "s/python\([0-9]\.[0-9]\)/python$$version/g" \
- build-$$version/*/Makefile build-$$version/Makefile; \
- done
- test ! -e failed-stamp && touch $@
- rm -f failed-stamp
+ mkdir -p build-$*
+ cd build-$* && echo yes \
+ | python$* ../configure.py \
+ -c -n /usr/include/qscintilla \
+ -o /usr/lib -u -j $(SPLIT) \
+ -d /usr/lib/python$*/site-packages \
+ -l /usr/include/python$* \
+ -v /usr/share/sip/qt \
+ -m /usr/lib/python$*/config \
+ CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
+ touch $@
-build: build-stamp
-build-stamp: configure
+dbg-build-%/configure-stamp: patch-stamp
dh_testdir
- rm -f failed-stamp
- for version in ${PYTHONS};\
- do\
- cd build-$$version;\
- $(MAKE) || touch ../failed-stamp;\
- cd ..;\
- done
- test ! -e failed-stamp && touch $@
- rm -f failed-stamp
+ mkdir -p dbg-build-$*
+ cd dbg-build-$* && echo yes \
+ | python$*-dbg ../configure.py \
+ -c -n /usr/include/qscintilla \
+ -o /usr/lib -u -j $(SPLIT) \
+ -d /usr/lib/python$*/site-packages \
+ -l /usr/include/python$*_d \
+ -v /usr/share/sip/qt \
+ -m /usr/lib/python$*/config_d \
+ CXXFLAGS_RELEASE="" CXXFLAGS="-O0 -g" STRIP=""
+ touch $@
+
+build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+
+build-%/build-stamp: build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C build-$*
+ touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C dbg-build-$*
+ touch $@
install-indep: configure
dh_testdir
@@ -74,16 +90,31 @@
for version in ${PYTHONS}; do \
$(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
done
+ for version in ${PYTHONS}; do \
+ $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-qt3-dbg;\
+ mkdir -p debian/python-qt3-gl-dbg/usr/lib/python$$version/site-packages;\
+ mv debian/python-qt3-dbg/usr/lib/python$$version/site-packages/qtgl.so \
+ debian/python-qt3-gl-dbg/usr/lib/python$$version/site-packages/;\
+ mkdir -p debian/python-qtext-dbg/usr/lib/python$$version/site-packages;\
+ mv debian/python-qt3-dbg/usr/lib/python$$version/site-packages/qtext.so \
+ debian/python-qtext-dbg/usr/lib/python$$version/site-packages/;\
+ done
+
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+ for i in $$(find debian/python-*-dbg -name '*.so'); do \
+ b=$$(basename $$i .so); \
+ mv $$i $$(dirname $$i)/$${b}_d.so; \
+ done
+ find debian/python-*-dbg ! -type d \
+ ! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
+ find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
clean: unpatch
dh_testdir
dh_testroot
+ rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
rm -f *-stamp
- for version in ${PYTHONS};\
- do\
- rm -fr build-$$version;\
- done
dh_clean
# Must not depend on anything. This is to be called by
@@ -97,7 +128,16 @@
dh_installdocs -A NEWS THANKS
dh_installexamples
dh_link
- dh_strip
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+ DH_OPTIONS= dh_strip -ppyqt-tools
+ set -e; \
+ for p in python-qt3 python-qt3-gl python-qtext; do \
+ DH_OPTIONS= dh_strip -p$$p --dbg-package=$$p-dbg; \
+ rm -rf debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ ln -s $$p debian/$$p-dbg/usr/share/doc/$$p-dbg; \
+ done
+endif
+# dh_strip
dh_compress -X.py -X.bmp -X.ui -X.sql
dh_fixperms
DH_PYCENTRAL=nomove dh_pycentral
More information about the Python-modules-commits
mailing list