[Python-modules-commits] r11370 - in packages/python-qt3/trunk/debian (9 files)
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Wed Jan 27 22:24:39 UTC 2010
Date: Wednesday, January 27, 2010 @ 22:24:32
Author: shlomme
Revision: 11370
Prepare for new experimental upload
Added:
packages/python-qt3/trunk/debian/patches/debian_configure_changes.diff
packages/python-qt3/trunk/debian/patches/series
packages/python-qt3/trunk/debian/source/
packages/python-qt3/trunk/debian/source/format
Modified:
packages/python-qt3/trunk/debian/changelog
packages/python-qt3/trunk/debian/control
packages/python-qt3/trunk/debian/rules
Deleted:
packages/python-qt3/trunk/debian/patches/00list
packages/python-qt3/trunk/debian/patches/01_configure.dpatch
Modified: packages/python-qt3/trunk/debian/changelog
===================================================================
--- packages/python-qt3/trunk/debian/changelog 2010-01-27 21:13:24 UTC (rev 11369)
+++ packages/python-qt3/trunk/debian/changelog 2010-01-27 22:24:32 UTC (rev 11370)
@@ -1,3 +1,19 @@
+python-qt3 (3.18.1-3) experimental; urgency=low
+
+ * Converted to source format "3.0 (quilt)"
+ * debian/rules
+ - removed dpatch handling
+ - added call to dh_sip
+ * debian/control
+ - Removed build dependency on dpatch
+ - Updated build dependencies for new sip 4.10
+ - Added ${sip:Depends} to python-qt3
+ - Added ${misc:Depends} to all packages
+ * debian/patches/debian_configure_changes.diff
+ - Adapted to new sip out-of-tree build support
+
+ -- Torsten Marek <shlomme at debian.org> Wed, 27 Jan 2010 22:19:23 +0100
+
python-qt3 (3.18.1-2) unstable; urgency=low
* Update maintainer to Debian Python Packaging Team (Closes: #540945)
@@ -5,7 +21,7 @@
- Updated dependencies for sip4 4.9
- Bumped standards version to 3.8.3
* Added README.source for dpatch patch system
- * Added lintian overrides for extra-license-file in python-qt-dev due to
+ * Added lintian overrides for extra-license-file in python-qt-dev due to
false-positive
-- Michael Casadevall <mcasadevall at debian.org> Wed, 04 Nov 2009 03:01:20 -0500
Modified: packages/python-qt3/trunk/debian/control
===================================================================
--- packages/python-qt3/trunk/debian/control 2010-01-27 21:13:24 UTC (rev 11369)
+++ packages/python-qt3/trunk/debian/control 2010-01-27 22:24:32 UTC (rev 11370)
@@ -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>, Bernd Zeimetz <bzed at debian.org>, Michael Casadevall <mcasadevall at debian.org>
-Build-Depends: debhelper (>= 6.0.7~), 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.9), python-sip4-dev (>= 4.9), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), dpatch, python-sip4-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), 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), python-sip-dev (>= 4.10), libqscintilla-dev (>= 1.7), python-support (>= 0.7.1), python-sip4-dbg, python-all-dbg
Standards-Version: 3.8.3
Homepage: http://www.riverbankcomputing.co.uk/pyqt/index.php
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-qt3/trunk/
@@ -11,7 +11,7 @@
Package: python-qt3
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-sip4 (>= 4.9), python-sip4 (<= 4.9.1)
+Depends: ${shlibs:Depends}, ${python:Depends}, ${sip:Depends}, ${misc:Depends}
Suggests: python-qt3-gl, python-qt3-doc, libqt3-mt-mysql|libqt3-mt-odbc|libqt3-mt-psql
Provides: ${python:Provides}
Description: Qt3 bindings for Python
@@ -28,7 +28,7 @@
Architecture: any
Priority: extra
Section: debug
-Depends: ${shlibs:Depends}, python-dbg, python-qt3 (= ${binary:Version}), python-sip4-dbg (>= 4.9)
+Depends: ${shlibs:Depends}, python-dbg, python-qt3 (= ${binary:Version}), python-sip-dbg, ${misc:Depends}
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
@@ -38,7 +38,7 @@
Package: python-qt3-gl
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2)
+Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version}), python-opengl (>= 2.0.1.09-2.2), ${misc:Depends}
Suggests: python-qt3-doc
Provides: ${python:Provides}
Description: Qt3 OpenGL bindings for Python
@@ -51,7 +51,7 @@
Priority: extra
Section: debug
Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qt3-gl (= ${binary:Version}), python-qt3-dbg (= ${binary:Version})
+Depends: ${shlibs:Depends}, python-dbg, python-qt3-gl (= ${binary:Version}), python-qt3-dbg (= ${binary:Version}), ${misc: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
@@ -62,7 +62,7 @@
Package: python-qtext
Architecture: any
-Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${python:Depends}, python-qt3 (= ${binary:Version}), ${misc:Depends}
Provides: ${python:Provides}
Description: Qt extensions for PyQt
PyQt Extensions. Contains:
@@ -74,7 +74,7 @@
Priority: extra
Section: debug
Architecture: any
-Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-qt3-dbg (= ${binary:Version})
+Depends: ${shlibs:Depends}, python-dbg, python-qtext (= ${binary:Version}), python-qt3-dbg (= ${binary:Version}), ${misc:Depends}
Description: Qt debug extensions for PyQt
PyQt debug Extensions. Contains:
.
@@ -83,7 +83,7 @@
Package: pyqt-tools
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: pyuic and pylupdate for Qt3
pyuic is the PyQt counterpart for Qt's uic. It takes an XML
user interface file and generates Python code.
@@ -94,6 +94,7 @@
Package: python-qt-dev
Suggests: sip4
Replaces: python-qt3 (<< 3.17.3-2)
+Depends: ${misc:Depends}
Architecture: all
Description: Qt bindings for Python - Development files
Development .sip files with definitions of PyQt classes. They
@@ -103,6 +104,7 @@
Package: python-qt3-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}
Suggests: python-qt3
Description: Qt bindings for Python - Documentation and examples
Documentation and examples for the PyQt (bindings that allow
Deleted: packages/python-qt3/trunk/debian/patches/00list
===================================================================
--- packages/python-qt3/trunk/debian/patches/00list 2010-01-27 21:13:24 UTC (rev 11369)
+++ packages/python-qt3/trunk/debian/patches/00list 2010-01-27 22:24:32 UTC (rev 11370)
@@ -1 +0,0 @@
-01_configure
Deleted: packages/python-qt3/trunk/debian/patches/01_configure.dpatch
===================================================================
--- packages/python-qt3/trunk/debian/patches/01_configure.dpatch 2010-01-27 21:13:24 UTC (rev 11369)
+++ packages/python-qt3/trunk/debian/patches/01_configure.dpatch 2010-01-27 22:24:32 UTC (rev 11370)
@@ -1,123 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_configure.dpatch by Torsten Marek <shlomme at debian.org>
-##
-## DP: Add object directory build support to configure.py
-
- at DPATCH@
-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
-
-+topsrcdir = os.path.dirname(os.path.abspath(__file__))
-+has_objdir = topsrcdir != os.path.abspath(os.path.curdir)
-+if not has_objdir:
-+ topsrcdir = None
-+
-+def srcPath(filename):
-+ if topsrcdir is not None:
-+ return os.path.join(topsrcdir, filename)
-+ return filename
-
- # Initialise the globals.
- pyqt_version = 0x031103
-@@ -304,7 +313,8 @@
- install_dir=opt_pyqtbindir,
- console=1,
- qt=1,
-- warnings=1
-+ warnings=1,
-+ topsrcdir=topsrcdir
- )
-
- makefile.extra_defines.append("UIC")
-@@ -316,6 +326,14 @@
- if qt_version < 0x030100:
- makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
-
-+ if has_objdir:
-+ makefile.extra_include_dirs.append(srcPath("pyuic3"))
-+ try:
-+ os.mkdir("pyuic3")
-+ except OSError, e:
-+ if e.errno != 17:
-+ raise e
-+
- makefile.generate()
- tool_dirs.append("pyuic3")
-
-@@ -335,7 +353,8 @@
- install_dir=opt_pyqtbindir,
- console=1,
- qt=1,
-- warnings=1
-+ warnings=1,
-+ topsrcdir=topsrcdir
- )
-
- makefile.extra_defines.append("QT_INTERNAL_XML")
-@@ -343,6 +362,14 @@
- if prof or "qtxml" not in pyqt_modules:
- makefile.extra_defines.append("QT_MODULE_XML")
-
-+ if has_objdir:
-+ makefile.extra_include_dirs.append(srcPath("pylupdate3"))
-+ try:
-+ os.mkdir("pylupdate3")
-+ except OSError, e:
-+ if e.errno != 17:
-+ raise e
-+
- makefile.generate()
- tool_dirs.append("pylupdate3")
- elif qt_version >= 0x020000:
-@@ -599,7 +626,7 @@
- opengl is set if the application uses OpenGL.
- """
- # Check the module's main .sip file exists.
-- if os.access(os.path.join("sip", mname, mname + "mod.sip"), os.F_OK):
-+ if os.access(srcPath(os.path.join("sip", mname, mname + "mod.sip")), os.F_OK):
- 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 +925,14 @@
- argv.append(buildfile)
-
- argv.append("-I")
-- argv.append("sip")
-+ argv.append(srcPath("sip"))
-
- # SIP assumes POSIX style path separators.
-- argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
-+ if topsrcdir is not None:
-+ argv.append(string.join([topsrcdir, "sip", mname, mname + "mod.sip"], "/"))
-+ else:
-+ argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
-+
-
- os.system(string.join(argv))
-
-@@ -916,7 +947,11 @@
- sipfiles = []
-
- for s in glob.glob("sip/" + mname + "/*.sip"):
-- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
-+ if has_objdir:
-+ topdir = topsrcdir
-+ else:
-+ topdir = ".."
-+ sipfiles.append(os.path.join(topdir, "sip", mname, os.path.basename(s)))
-
- installs.append([sipfiles, os.path.join(pyqt.sip_dir(), mname)])
-
-@@ -1418,7 +1453,7 @@
- ).generate()
-
- # Install the configuration module.
-- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
-+ create_config("pyqtconfig.py", srcPath("pyqtconfig.py.in"), macros)
-
-
- ###############################################################################
Added: packages/python-qt3/trunk/debian/patches/debian_configure_changes.diff
===================================================================
--- packages/python-qt3/trunk/debian/patches/debian_configure_changes.diff (rev 0)
+++ packages/python-qt3/trunk/debian/patches/debian_configure_changes.diff 2010-01-27 22:24:32 UTC (rev 11370)
@@ -0,0 +1,95 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_configure.dpatch by Torsten Marek <shlomme at debian.org>
+##
+## DP: Add object directory build support to configure.py
+
+ at DPATCH@
+Index: python-qt3-3.18.1/configure.py
+===================================================================
+--- python-qt3-3.18.1.orig/configure.py 2010-01-27 22:24:38.555856708 +0100
++++ python-qt3-3.18.1/configure.py 2010-01-27 22:41:45.876854625 +0100
+@@ -30,6 +30,7 @@
+
+ import sipconfig
+
++src_dir = os.path.dirname(os.path.abspath(__file__))
+
+ # Initialise the globals.
+ pyqt_version = 0x031201
+@@ -299,7 +300,7 @@
+
+ makefile = sipconfig.ProgramMakefile(
+ configuration=sipcfg,
+- build_file=buildfile,
++ build_file=os.path.join(src_dir, "pyuic3", buildfile),
+ dir="pyuic3",
+ install_dir=opt_pyqtbindir,
+ console=1,
+@@ -315,7 +316,8 @@
+
+ if qt_version < 0x030100:
+ makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib")
+-
++ makefile.extra_include_dirs.append(os.path.join(src_dir, "pyuic3"))
++
+ makefile.generate()
+ tool_dirs.append("pyuic3")
+
+@@ -330,7 +332,7 @@
+
+ makefile = sipconfig.ProgramMakefile(
+ configuration=sipcfg,
+- build_file=buildfile,
++ build_file=os.path.join(src_dir, "pylupdate3", buildfile),
+ dir="pylupdate3",
+ install_dir=opt_pyqtbindir,
+ console=1,
+@@ -343,6 +345,8 @@
+ if prof or "qtxml" not in pyqt_modules:
+ makefile.extra_defines.append("QT_MODULE_XML")
+
++ makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3"))
++
+ makefile.generate()
+ tool_dirs.append("pylupdate3")
+ elif qt_version >= 0x020000:
+@@ -606,7 +610,7 @@
+ opengl is set if the application uses OpenGL.
+ """
+ # Check the module's main .sip file exists.
+- if os.access(os.path.join("sip", mname, mname + "mod.sip"), os.F_OK):
++ if os.access(os.path.join(src_dir, "sip", mname, mname + "mod.sip"), os.F_OK):
+ 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):
+@@ -908,10 +912,10 @@
+ argv.append(buildfile)
+
+ argv.append("-I")
+- argv.append("sip")
++ argv.append(os.path.join(src_dir, "sip"))
+
+ # SIP assumes POSIX style path separators.
+- argv.append(string.join(["sip", mname, mname + "mod.sip"], "/"))
++ argv.append(string.join([src_dir, "sip", mname, mname + "mod.sip"], "/"))
+
+ os.system(string.join(argv))
+
+@@ -926,7 +930,7 @@
+ sipfiles = []
+
+ for s in glob.glob("sip/" + mname + "/*.sip"):
+- sipfiles.append(os.path.join("..", "sip", mname, os.path.basename(s)))
++ sipfiles.append(os.path.join(src_dir, "sip", mname, os.path.basename(s)))
+
+ installs.append([sipfiles, os.path.join(pyqt.sip_dir(), mname)])
+
+@@ -1433,7 +1437,7 @@
+ ).generate()
+
+ # Install the configuration module.
+- create_config("pyqtconfig.py", "pyqtconfig.py.in", macros)
++ create_config("pyqtconfig.py", os.path.join(src_dir, "pyqtconfig.py.in"), macros)
+
+
+ ###############################################################################
Added: packages/python-qt3/trunk/debian/patches/series
===================================================================
--- packages/python-qt3/trunk/debian/patches/series (rev 0)
+++ packages/python-qt3/trunk/debian/patches/series 2010-01-27 22:24:32 UTC (rev 11370)
@@ -0,0 +1 @@
+debian_configure_changes.diff
Modified: packages/python-qt3/trunk/debian/rules
===================================================================
--- packages/python-qt3/trunk/debian/rules 2010-01-27 21:13:24 UTC (rev 11369)
+++ packages/python-qt3/trunk/debian/rules 2010-01-27 22:24:32 UTC (rev 11370)
@@ -5,8 +5,6 @@
export DH_OPTIONS
-include /usr/share/dpatch/dpatch.make
-
-include /usr/share/python/python.mk
ifeq (,$(py_sitename))
py_sitename = site-packages
@@ -41,7 +39,7 @@
.PRECIOUS: build-%/configure-stamp dbg-build-%/configure-stamp
configure: $(PYTHONS:%=build-%/configure-stamp) $(PYTHONS:%=dbg-build-%/configure-stamp)
-build-%/configure-stamp: patch-stamp
+build-%/configure-stamp:
dh_testdir
mkdir -p build-$*
cd build-$* && echo yes \
@@ -55,7 +53,7 @@
CXXFLAGS_RELEASE="" CXXFLAGS="${CXXFLAGS}" STRIP=""
touch $@
-dbg-build-%/configure-stamp: patch-stamp
+dbg-build-%/configure-stamp:
dh_testdir
mkdir -p dbg-build-$*
cd dbg-build-$* && echo yes \
@@ -122,7 +120,7 @@
! \( -name '*.so' -o -name '*config_d.py' \) | xargs rm -f
find debian/python-*-dbg -depth -type d -empty -exec rmdir {} \;
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
@@ -153,6 +151,7 @@
dh_compress -X.py -X.bmp -X.ui -X.sql
dh_fixperms
dh_pysupport
+ dh_sip
dh_lintian
dh_installdeb
dh_shlibdeps
Added: packages/python-qt3/trunk/debian/source/format
===================================================================
--- packages/python-qt3/trunk/debian/source/format (rev 0)
+++ packages/python-qt3/trunk/debian/source/format 2010-01-27 22:24:32 UTC (rev 11370)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Python-modules-commits
mailing list