[Python-modules-commits] r15387 - in packages/sip4-qt3/trunk/debian (10 files)
piotr at users.alioth.debian.org
piotr at users.alioth.debian.org
Sat Jan 22 23:10:32 UTC 2011
Date: Saturday, January 22, 2011 @ 23:10:31
Author: piotr
Revision: 15387
* Team upload.
* Merged in patch from Per W for Python 3 support, thank you.
* New upstream release
* Added Python 3 support (Closes: #587072)
- support default Python 3 interpreter only for now
- debian/rules: added dh_python3
- debian/rules: added install-arch-3.%
- debian/rules: added substvars to keep provides up-to-date
- debian/control: python-sip provides sip-api-8.0 and 8.1
- debian/control: python3-sip provides sip-py3api-8.0 and 8.1
* Added configure.py.patch, fixes FTBFS
* debian/patches/siputils_debian_changes.diff
- Refreshed
Added:
packages/sip4-qt3/trunk/debian/patches/configure.py.patch
packages/sip4-qt3/trunk/debian/python3-sip-dev.install
Modified:
packages/sip4-qt3/trunk/debian/changelog
packages/sip4-qt3/trunk/debian/control
packages/sip4-qt3/trunk/debian/patches/series
packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff
packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff
packages/sip4-qt3/trunk/debian/python-sip.install
packages/sip4-qt3/trunk/debian/rules
Deleted:
packages/sip4-qt3/trunk/debian/pyversions
Modified: packages/sip4-qt3/trunk/debian/changelog
===================================================================
--- packages/sip4-qt3/trunk/debian/changelog 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/changelog 2011-01-22 23:10:31 UTC (rev 15387)
@@ -1,11 +1,26 @@
-sip4-qt3 (4.10.2-2) UNRELEASED; urgency=low
+sip4-qt3 (4.12-1) unstable; urgency=low
- * Added python3 support (Closes: #587072)
- - Merged in patch from Per W, thank you.
+ * Team upload.
+
+ [ Michael Casadevall ]
+ * Merged in patch from Per W for Python 3 support, thank you.
* Add lintian overrides for incorrect warnings
- -- Michael Casadevall <mcasadevall at debian.org> Wed, 07 Jul 2010 05:48:23 -0400
+ [ Michał Zając ]
+ * New upstream release
+ * Added Python 3 support (Closes: #587072)
+ - support default Python 3 interpreter only for now
+ - debian/rules: added dh_python3
+ - debian/rules: added install-arch-3.%
+ - debian/rules: added substvars to keep provides up-to-date
+ - debian/control: python-sip provides sip-api-8.0 and 8.1
+ - debian/control: python3-sip provides sip-py3api-8.0 and 8.1
+ * Added configure.py.patch, fixes FTBFS
+ * debian/patches/siputils_debian_changes.diff
+ - Refreshed
+ -- Piotr Ożarowski <piotr at debian.org> Sat, 22 Jan 2011 23:14:48 +0100
+
sip4-qt3 (4.10.2-1) unstable; urgency=low
* New upstream release
Modified: packages/sip4-qt3/trunk/debian/control
===================================================================
--- packages/sip4-qt3/trunk/debian/control 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/control 2011-01-22 23:10:31 UTC (rev 15387)
@@ -2,20 +2,19 @@
Section: devel
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 (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg,
- python-support (>= 0.7.1), python3-all-dev, python3-all-dbg
-Standards-Version: 3.8.4
+Uploaders: Torsten Marek <shlomme at debian.org>, Bernd Zeimetz <bzed at debian.org>, Michael Casadevall <mcasadevall at debian.org>
+Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), python3-all-dev, python3-all-dbg
+Standards-Version: 3.9.1
Homepage: http://www.riverbankcomputing.co.uk/software/sip/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/sip4-qt3/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sip4-qt3/trunk/
-XS-Python-Version: all
+XS-Python-Version: >= 2.4
+X-Python3-Version: >= 3.0
Package: python-sip
Architecture: any
Section: python
-Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
+Provides: ${python:Provides}
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-sip4 (<< 4.10)
Replaces: python-sip4 (<< 4.10)
@@ -24,18 +23,6 @@
borrowed from SWIG, but capable of tighter bindings because of its
specificity towards C++ and Python.
-Package: python3-sip
-Architecture: any
-Section: python
-Provides: ${python:Provides}, sip-api-7.0, sip-api-7.1
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Description: Python/C++ bindings generator runtime library
- SIP is a tool for generating bindings for C++ classes with some ideas
- borrowed from SWIG, but capable of tighter bindings because of its
- specificity towards C++ and Python.
- .
- This package contains bindings suitable for Python3
-
Package: python-sip-dbg
Priority: extra
Architecture: any
@@ -122,7 +109,7 @@
Architecture: all
Section: debug
Priority: extra
-Depends: python-sip-dbg, ${misc:Depends}
+Depends: python-sip-dbg, ${misc:Depends}, python-sip4 (= ${binary:Version})
Description: Python/C++ bindings generator runtime library (debug, transitional package)
SIP is a tool for generating bindings for C++ classes with some ideas
borrowed from SWIG, but capable of tighter bindings because of its
@@ -130,3 +117,54 @@
.
This is a transitional package that depends on python-sip-dev.
It can be safely removed.
+
+Package: python3-sip
+Architecture: any
+Section: python
+Provides: ${python3:Provides}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package provides SIP with support for Python 3
+
+Package: python3-sip-dev
+Architecture: any
+Section: python
+Depends: ${python:Depends}, python3-sip (= ${binary:Version}), python-dev, ${shlibs:Depends}, libjs-jquery, ${misc:Depends}
+Recommends: python3-sip (>= ${source:Version})
+Description: Python/C++ bindings generator development files
+ SIP is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ SIP was originally designed to generate Python bindings for KDE and so
+ has explicit support for the signal slot mechanism used by the Qt/KDE
+ class libraries.
+ .
+ Features:
+ - connecting Qt signals to Python functions and class methods
+ - connecting Python signals to Qt slots
+ - overloading virtual member functions with Python class methods
+ - protected member functions
+ - abstract classes
+ - enumerated types
+ - global class instances
+ - static member functions.
+ .
+ This package contains the code generator tool and the development headers
+ needed to develop Python 3 bindings with sip.
+
+Package: python3-sip-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: python3-sip (= ${binary:Version}), python3-dbg, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3/C++ bindings generator runtime library
+ SIP is a tool for generating bindings for C++ classes with some ideas
+ borrowed from SWIG, but capable of tighter bindings because of its
+ specificity towards C++ and Python.
+ .
+ This package contains debugging symbols for python3-sip
Added: packages/sip4-qt3/trunk/debian/patches/configure.py.patch
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/configure.py.patch (rev 0)
+++ packages/sip4-qt3/trunk/debian/patches/configure.py.patch 2011-01-22 23:10:31 UTC (rev 15387)
@@ -0,0 +1,17 @@
+Index: sip-4.12/configure.py
+===================================================================
+--- sip-4.12.orig/configure.py 2011-01-06 12:06:05.357805001 +0100
++++ sip-4.12/configure.py 2011-01-06 14:20:02.747805001 +0100
+@@ -219,9 +219,11 @@
+ ("siplib", "siplib.c"),
+ ("siplib", "siplib.sbf")
+ )
++ if not os.path.exists(patched[0][0]):
++ os.mkdir(patched[0][0])
+
+ for f in patched:
+- dst_fn = os.path.join(*f)
++ dst_fn = os.path.join(src_dir, *f)
+ src_fn = os.path.join(src_dir, dst_fn + ".in")
+
+ siputils.inform("Creating %s..." % dst_fn)
Modified: packages/sip4-qt3/trunk/debian/patches/series
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/series 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/patches/series 2011-01-22 23:10:31 UTC (rev 15387)
@@ -1,2 +1,3 @@
siputils_debian_changes.diff
siputils_objdir_module_fix.diff
+configure.py.patch
Modified: packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/patches/siputils_debian_changes.diff 2011-01-22 23:10:31 UTC (rev 15387)
@@ -1,10 +1,10 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_siputils.dpatch by Torsten Marek <shlomme at debian.org>
-Index: sip4-qt3-4.10/siputils.py
+Index: sip-4.12/siputils.py
===================================================================
---- sip4-qt3-4.10.orig/siputils.py 2010-01-14 15:52:09.000000000 +0100
-+++ sip4-qt3-4.10/siputils.py 2010-01-26 21:09:49.172700039 +0100
-@@ -718,7 +718,8 @@
+--- sip-4.12.orig/siputils.py 2011-01-05 18:12:04.968846002 +0100
++++ sip-4.12/siputils.py 2011-01-05 18:13:46.838846002 +0100
+@@ -722,7 +722,8 @@
libs.extend(self.optional_list("LIBS_WINDOWS"))
@@ -14,7 +14,11 @@
# Save the transformed values.
self.CFLAGS.set(cflags)
-@@ -843,6 +844,15 @@
+@@ -849,9 +850,19 @@
+ """Return a list of additional libraries (in platform specific form)
+ that must be linked with a library.
+
++
clib is the library name in cannonical form.
framework is set of the library is implemented as a MacOS framework.
"""
@@ -29,4 +33,4 @@
+
prl_libs = []
- if self.generator in ("MSVC", "MSVC.NET", "BMAKE"):
+ if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
Modified: packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff
===================================================================
--- packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/patches/siputils_objdir_module_fix.diff 2011-01-22 23:10:31 UTC (rev 15387)
@@ -1,8 +1,8 @@
-Index: sip4-qt3-4.10/siputils.py
+Index: sip-4.12/siputils.py
===================================================================
---- sip4-qt3-4.10.orig/siputils.py 2010-01-26 23:45:34.144734105 +0100
-+++ sip4-qt3-4.10/siputils.py 2010-01-26 23:46:51.605699383 +0100
-@@ -1546,9 +1546,12 @@
+--- sip-4.12.orig/siputils.py 2011-01-05 18:11:27.168846002 +0100
++++ sip-4.12/siputils.py 2011-01-05 18:11:51.218846002 +0100
+@@ -1555,9 +1555,12 @@
mfile.write("\n$(OFILES): $(HFILES)\n")
for mf in self._build["moc_headers"].split():
Modified: packages/sip4-qt3/trunk/debian/python-sip.install
===================================================================
--- packages/sip4-qt3/trunk/debian/python-sip.install 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/python-sip.install 2011-01-22 23:10:31 UTC (rev 15387)
@@ -1 +1 @@
-usr/lib/python2*/*-packages/sip.so
+usr/lib/python2.*/*-packages/sip.so
Added: packages/sip4-qt3/trunk/debian/python3-sip-dev.install
===================================================================
--- packages/sip4-qt3/trunk/debian/python3-sip-dev.install (rev 0)
+++ packages/sip4-qt3/trunk/debian/python3-sip-dev.install 2011-01-22 23:10:31 UTC (rev 15387)
@@ -0,0 +1 @@
+usr/lib/python3*/*-packages/sipdistutils.py
Deleted: packages/sip4-qt3/trunk/debian/pyversions
===================================================================
--- packages/sip4-qt3/trunk/debian/pyversions 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/pyversions 2011-01-22 23:10:31 UTC (rev 15387)
@@ -1 +0,0 @@
-2.3-
Modified: packages/sip4-qt3/trunk/debian/rules
===================================================================
--- packages/sip4-qt3/trunk/debian/rules 2011-01-22 10:20:53 UTC (rev 15386)
+++ packages/sip4-qt3/trunk/debian/rules 2011-01-22 23:10:31 UTC (rev 15387)
@@ -2,19 +2,21 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DH_OPTIONS
+PY2_PROVIDES=sip-api-8.0, sip-api-8.1
+PY3_PROVIDES=sip-py3api-8.0, sip-py3api-8.1
+# `dh_python3 --depends sip` should generate dependency on newest API only
+PYDIST=sip $(shell python -c "a=[i.strip() for i in '$(PY3_PROVIDES)'.split(',')]; print sorted(a, reverse=True)[0]")
INSTDIR=$(CURDIR)/debian
CFLAGS=
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0 -g
else
CFLAGS += -O2 -g
endif
-PYTHONS := $(shell pyversions -vr debian/control) 3.1
+PYTHONS := $(shell pyversions -vr) $(shell py3versions -vd)
-include /usr/share/python/python.mk
ifeq (,$(py_sitename))
@@ -65,13 +67,16 @@
clean:
dh_testdir
dh_testroot
- rm -rf *-stamp siputils.pyc $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
- dh_clean
+ rm -rf *-stamp siputils.pyc __pycache__ $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
+ dh_clean debian/python3-sip.pydist
install-arch: build
dh_testdir
- dh_testroot
+ dh_testroot
dh_prep -a
+ echo "python:Provides=$(PY2_PROVIDES)" >> debian/python-sip.substvars
+ echo "python3:Provides=$(PY3_PROVIDES)" >> debian/python3-sip.substvars
+ echo "$(PYDIST)" > debian/python3-sip.pydist
dh_installdirs -a
# This is needed to enforce that the install-arch-% rules are
# not run in parallel. Both rules install into the same directory,
@@ -82,26 +87,36 @@
$(MAKE) -f debian/rules install-arch-$$p;\
done
- for i in $$(find debian/python-sip-dbg -name '*.so'); do \
+ for i in $$(find debian/python*-sip-dbg -name '*.so'); do \
b=$$(basename $$i .so); \
mv $$i $$(dirname $$i)/$${b}_d.so; \
done
- find debian/python-sip-dbg ! -type d ! -name '*_d.*' | xargs rm -f
- find debian/python-sip-dbg -depth -empty -exec rmdir {} \;
+ find debian/python*-sip-dbg ! -type d ! -name '*_d.*' | xargs rm -f
+ find debian/python*-sip-dbg -depth -empty -exec rmdir {} \;
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
install -m 755 -o root -g root debian/dh_sip debian/python-sip-dev/usr/bin
+install-arch-3.%:
+ $(MAKE) -C build-3.$* install DESTDIR=$(CURDIR)/debian/tmp
+ $(MAKE) -C dbg-build-3.$* install DESTDIR=$(CURDIR)/debian/python3-sip-dbg
+ mkdir -p debian/python3-sip/usr/lib/python3.$*/dist-packages/
+ 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/lib/python3.$*/dist-packages
+ install -m 644 -o root -g root sipdistutils.py debian/python3-sip-dev/usr/lib/python3.$*/dist-packages
+
install-arch-%:
$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C dbg-build-$* install DESTDIR=$(CURDIR)/debian/python-sip-dbg
mkdir -p debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/
- echo "$*"
- if [ "$*" \< "3" ]; then \
- install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/; \
- else \
- install -m 644 -o root -g root debian/sipconfig_py3.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig.py; \
- fi
+ install -m 644 -o root -g root debian/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/
install -m 644 -o root -g root build-$*/sipconfig.py debian/python-sip/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_nd.py
install -m 644 -o root -g root dbg-build-$*/sipconfig.py debian/python-sip-dbg/usr/lib/python$*/$(call py_sitename,$*)/sipconfig_d.py
mkdir -p debian/python-sip-dev/usr/include/python$*
@@ -128,6 +143,8 @@
ifneq (,$(findstring -a, $(DH_OPTIONS)))
DH_OPTIONS= dh_strip -ppython-sip-dev
DH_OPTIONS= dh_strip -ppython-sip -Npython-sip-dev --dbg-package=python-sip-dbg
+ DH_OPTIONS= dh_strip -ppython3-sip-dev
+ DH_OPTIONS= dh_strip -ppython3-sip -Npython3-sip-dev --dbg-package=python3-sip-dbg
rm -rf debian/python-sip-dbg/usr/share/doc/python-sip-dbg
mkdir -p debian/python-sip-dbg/usr/share/doc
ln -s python-sip debian/python-sip-dbg/usr/share/doc/python-sip-dbg
@@ -135,6 +152,7 @@
dh_compress
dh_fixperms
dh_pysupport
+ dh_python3
dh_installdeb
dh_shlibdeps
dh_gencontrol
More information about the Python-modules-commits
mailing list