[Python-modules-commits] r3259 - in /packages/python-kde3/trunk/debian: changelog control patches/00list patches/01_configure.py.dpatch patches/04_dcop.dpatch patches/04_no-konsole-part.dpatch pykdeconfig.py rules
shlomme at users.alioth.debian.org
shlomme at users.alioth.debian.org
Sun Sep 16 12:41:52 UTC 2007
Author: shlomme
Date: Sun Sep 16 12:41:51 2007
New Revision: 3259
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3259
Log:
* merged with Ubuntu, prepared new upload
Added:
packages/python-kde3/trunk/debian/patches/04_dcop.dpatch (with props)
packages/python-kde3/trunk/debian/pykdeconfig.py
Removed:
packages/python-kde3/trunk/debian/patches/04_no-konsole-part.dpatch
Modified:
packages/python-kde3/trunk/debian/changelog
packages/python-kde3/trunk/debian/control
packages/python-kde3/trunk/debian/patches/00list
packages/python-kde3/trunk/debian/patches/01_configure.py.dpatch
packages/python-kde3/trunk/debian/rules
Modified: packages/python-kde3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/python-kde3/trunk/debian/changelog?rev=3259&op=diff
==============================================================================
--- packages/python-kde3/trunk/debian/changelog (original)
+++ packages/python-kde3/trunk/debian/changelog Sun Sep 16 12:41:51 2007
@@ -1,3 +1,13 @@
+python-kde3 (3.16.0-3) unstable; urgency=low
+
+ * Merge with Ubuntu:
+ * Unable Konsole bindings.
+ * Build debug package.
+ * Adopt DCOP patch from Ubuntu.
+ * Better debian/rules file.
+
+ -- Torsten Marek <shlomme at debian.org> Sun, 16 Sep 2007 13:57:44 +0200
+
python-kde3 (3.16.0-2) unstable; urgency=low
* Include dcopext.py and dcopexport.py. (Closes: #440633)
Modified: packages/python-kde3/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/python-kde3/trunk/debian/control?rev=3259&op=diff
==============================================================================
--- packages/python-kde3/trunk/debian/control (original)
+++ packages/python-kde3/trunk/debian/control Sun Sep 16 12:41:51 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Ricardo Javier Cardenes Medina <rcardenes at debian.org>
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), libqt3-mt-dev (>= 3:3.3.7-1), qt3-dev-tools (>= 3:3.3.7-1), qt3-apps-dev (>= 3:3.3.7-1), python, python-all-dev, sip4 (>= 4.7), sip4 (<< 4.8), python-sip4-dev (>= 4.7), python-qt-dev (>= 3.17.3), kdelibs4-dev, python-central (>= 0.5.8), dpatch
+Build-Depends: debhelper (>= 5.0.38), libqt3-mt-dev (>= 3:3.3.7-1), qt3-dev-tools (>= 3:3.3.7-1), qt3-apps-dev (>= 3:3.3.7-1), python, python-all-dev, python-all-dbg, sip4 (>= 4.7), sip4 (<< 4.8), python-sip4-dev (>= 4.7), python-qt-dev (>= 3.17.3), kdelibs4-dev, python-central (>= 0.5.8), dpatch, konsole (>= 4:3.5.6)
Standards-Version: 3.7.2
XS-Python-Version: all
@@ -17,6 +17,18 @@
from kio, kjs, khtml and kprint.
.
Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php
+
+Package: python-kde3-dbg
+Priority: extra
+Architecture: any
+Depends: python-kde3 (= ${binary:Version}), python-dbg, python-qt3-dbg, ${shlibs:Depends}
+XB-Python-Version: ${python:Versions}
+Description: KDE3 bindings for Python (debug extensions)
+ Python binding module that provides wide access to the KDE3 API,
+ also known as PyKDE. Using this, you'll get (for example) classes
+ from kio, kjs, khtml and kprint.
+ .
+ This package contains the extension built for the python debug interpreter.
Package: python-kde3-dev
Section: python
Modified: packages/python-kde3/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/python-modules/packages/python-kde3/trunk/debian/patches/00list?rev=3259&op=diff
==============================================================================
--- packages/python-kde3/trunk/debian/patches/00list (original)
+++ packages/python-kde3/trunk/debian/patches/00list Sun Sep 16 12:41:51 2007
@@ -1,5 +1,5 @@
01_configure.py
02_klibloader
03_sip-4.7
-04_no-konsole-part
+04_dcop
05_kmimetype-is
Modified: packages/python-kde3/trunk/debian/patches/01_configure.py.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-kde3/trunk/debian/patches/01_configure.py.dpatch?rev=3259&op=diff
==============================================================================
--- packages/python-kde3/trunk/debian/patches/01_configure.py.dpatch (original)
+++ packages/python-kde3/trunk/debian/patches/01_configure.py.dpatch Sun Sep 16 12:41:51 2007
@@ -5,8 +5,8 @@
@DPATCH@
diff -urNad python-kde3-3.16.0~/configure.py python-kde3-3.16.0/configure.py
---- python-kde3-3.16.0~/configure.py 2007-09-02 16:22:12.000000000 +0200
-+++ python-kde3-3.16.0/configure.py 2007-09-02 16:26:09.000000000 +0200
+--- python-kde3-3.16.0~/configure.py 2006-09-22 10:05:49.000000000 +0200
++++ python-kde3-3.16.0/configure.py 2007-09-16 11:45:10.000000000 +0200
@@ -41,6 +41,26 @@
except:
sipconfig.error ("Can't find pyqtconfig.py in sys.path - exiting")
@@ -164,20 +164,7 @@
makefile.extra_include_dirs.append (opt_kdeincdir)
if kde_includes [mname]:
for incdir in kde_includes [mname]:
-@@ -730,9 +762,9 @@
- makefile.extra_libs.append ("kdeui")
- if extra_lib == "kabc" and kde_version >= 0x030200:
- makefile.extra_libs.append ("kabc_file")
-- if extra_lib == "kparts" and kde_version >= 0x030500:
-- makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "kde3"))
-- makefile.extra_libs.append ("konsolepart")
-+# if extra_lib == "kparts" and kde_version >= 0x030500:
-+# makefile.extra_lib_dirs.append (os.path.join (opt_kdelibdir, "kde3"))
-+# makefile.extra_libs.append ("konsolepart")
-
- if extra_lib == "kdeprint":
- makefile.extra_cflags.append ("-fno-rtti")
-@@ -759,22 +791,22 @@
+@@ -759,17 +791,17 @@
sipconfig.ParentMakefile(
configuration = pyqtcfg,
subdirs = subdirs,
@@ -185,52 +172,22 @@
+ installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)]
).generate()
-- if kde_version >= 0x030500:
-- f = open ("Makefile", "r")
-- buff = f.read ()
-- f.close ()
+ if kde_version >= 0x030500:
+ f = open ("Makefile", "r")
+ buff = f.read ()
+ f.close ()
- target = os.path.join (opt_kdelibdir, "kde3", "libkonsolepart.so")
- symlink = os.path.join (opt_kdelibdir, "libkonsolepart.so")
- buff = buff.replace ("install:\n", "install:\n\tln -sf %s %s\n" % (target, symlink))
- buff = buff.replace ("\nclean", "\tldconfig\n\nclean")
-- f = open ("Makefile.new", "w")
-- f.write (buff)
-- f.close ()
-- os.unlink ("Makefile")
-- os.rename ("Makefile.new", "Makefile")
-+# if kde_version >= 0x030500:
-+# f = open ("Makefile", "r")
-+# buff = f.read ()
-+# f.close ()
+# target = os.path.join (opt_kdelibdir, "kde3", "libkonsolepart.so")
+# symlink = os.path.join (opt_kdelibdir, "libkonsolepart.so")
+# buff = buff.replace ("install:\n", "install:\n\tln -sf %s %s\n" % (target, symlink))
+# buff = buff.replace ("\nclean", "\tldconfig\n\nclean")
-+# f = open ("Makefile.new", "w")
-+# f.write (buff)
-+# f.close ()
-+# os.unlink ("Makefile")
-+# os.rename ("Makefile.new", "Makefile")
-
- def fileOpts (fn):
- try:
-@@ -909,13 +941,22 @@
- set_sip_flags()
-
- for module in pykde_modules [opt_startmod:opt_endmod]:
-- generate_code (module, pykde_imports [module], extra_lib = module)
-+ # For MIPS we need an extra compiler flag for the qt module as we
-+ # exceed the GOT table size
-+ if (module == 'kdeui') and (os.environ.get('DEB_BUILD_ARCH') in ['mips', 'mipsel']):
-+ debian_cflags = "-Wa,-xgot"
-+ else:
-+ debian_cflags = None
-+
-+ generate_code (module, pykde_imports [module], extra_lib = module,
-+ extra_cxxflags=debian_cflags,
-+ extra_cflags=debian_cflags)
-
- # Create the additional Makefiles.
+ f = open ("Makefile.new", "w")
+ f.write (buff)
+ f.close ()
+@@ -915,7 +947,7 @@
create_makefiles()
# Install the configuration module.
Added: packages/python-kde3/trunk/debian/patches/04_dcop.dpatch
URL: http://svn.debian.org/wsvn/python-modules/packages/python-kde3/trunk/debian/patches/04_dcop.dpatch?rev=3259&op=file
==============================================================================
--- packages/python-kde3/trunk/debian/patches/04_dcop.dpatch (added)
+++ packages/python-kde3/trunk/debian/patches/04_dcop.dpatch Sun Sep 16 12:41:51 2007
@@ -1,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## kubuntu_01_dcop.diff.dpatch by <doko at mbo.net.local>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad python-kde3-3.16.0~/extensions/dcopexport.py python-kde3-3.16.0/extensions/dcopexport.py
+--- python-kde3-3.16.0~/extensions/dcopexport.py 2007-02-20 02:54:53.000000000 +0100
++++ python-kde3-3.16.0/extensions/dcopexport.py 2007-02-20 03:03:06.000000000 +0100
+@@ -98,7 +98,10 @@
+ elif self.method.rtype.startswith ("QMap") or self.method.rtype.startswith ("QValueList"):
+ dcop_add (params, args [i], self.argtypes [i])
+ else:
+- dcop_add (s, result)
++ if not result:
++ dcop_add (s, "")
++ else:
++ dcop_add (s, result)
+
+ # use append because we want to return the replyType reference,
+ # not a new QCString
Propchange: packages/python-kde3/trunk/debian/patches/04_dcop.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: packages/python-kde3/trunk/debian/pykdeconfig.py
URL: http://svn.debian.org/wsvn/python-modules/packages/python-kde3/trunk/debian/pykdeconfig.py?rev=3259&op=file
==============================================================================
--- packages/python-kde3/trunk/debian/pykdeconfig.py (added)
+++ packages/python-kde3/trunk/debian/pykdeconfig.py Sun Sep 16 12:41:51 2007
@@ -1,0 +1,11 @@
+# import the sipconfig.py for the normal or the debug build
+
+import sys
+
+if getattr(sys, "pydebug", False):
+ try:
+ from pykdeconfig_d import *
+ except ImportError, msg:
+ raise ImportError, 'No module named pykdeconfig; package python-kde3-dbg not installed'
+else:
+ from pykdeconfig_nd import *
Modified: packages/python-kde3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/python-modules/packages/python-kde3/trunk/debian/rules?rev=3259&op=diff
==============================================================================
--- packages/python-kde3/trunk/debian/rules (original)
+++ packages/python-kde3/trunk/debian/rules Sun Sep 16 12:41:51 2007
@@ -20,44 +20,51 @@
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=20
+else
+ SPLIT=4
+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;\
- python$$version ../configure.py -c -u \
- -k /usr -o /usr/include/kde -n /usr/lib \
- -v /usr/share/sip/kde3 -j4|| touch ../failed-stamp;\
- cd ..;\
- done
- test ! -e failed-stamp && touch configure-stamp
- rm -f failed-stamp
+ mkdir -p build-$*
+ cd build-$* && python$* ../configure.py \
+ -c -u -k /usr -o /usr/include/kde -n /usr/lib \
+ -v /usr/share/sip/kde3 -j $(SPLIT)
+ touch $@
+dbg-build-%/configure-stamp: patch-stamp
+ dh_testdir
+ mkdir -p dbg-build-$*
+ cd dbg-build-$* && python$*-dbg ../configure.py \
+ -c -u -k /usr -o /usr/include/kde -n /usr/lib \
+ -v /usr/share/sip/kde3 -j $(SPLIT)
+ touch $@
-build: configure-stamp build-stamp
-build-stamp:
+build: $(PYTHONS:%=build-%/build-stamp) $(PYTHONS:%=dbg-build-%/build-stamp)
+
+build-%/build-stamp: build-%/configure-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 build-stamp
- rm -f failed-stamp
+ $(MAKE) -C build-$*
+ touch $@
+
+dbg-build-%/build-stamp: dbg-build-%/configure-stamp
+ dh_testdir
+ $(MAKE) -C dbg-build-$*
+ touch $@
clean: unpatch
dh_testdir
dh_testroot
- rm -f *-stamp features
- for version in ${PYTHONS};\
- do\
- rm -fr build-$$version;\
- done
+ rm -f *-stamp
+ rm -rf $(PYTHONS:%=build-%) $(PYTHONS:%=dbg-build-%)
+
# remove autogenerated *mod.sip files and clean up sources
for moddir in sip/*;\
do\
@@ -78,7 +85,9 @@
for version in ${PYTHONS};\
do\
mkdir -p debian/python-kde3-dev/usr/lib/python-$$version/site-packages;\
- cp build-$$version/pykdeconfig.py debian/python-kde3-dev/usr/lib/python-$$version/site-packages;\
+ cp debian/pykdeconfig.py debian/python-kde3-dev/usr/lib/python-$$version/site-packages/;\
+ cp build-$$version/pykdeconfig.py debian/python-kde3-dev/usr/lib/python-$$version/site-packages/pykdeconfig_nd.py;\
+ cp dbg-build-$$version/pykdeconfig.py debian/python-kde3-dev/usr/lib/python-$$version/site-packages/pykdeconfig_d.py;\
done
install-arch:
@@ -86,12 +95,30 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
+ set -e; \
for version in ${PYTHONS};\
do\
- cd build-$$version && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp;\
- cd ..;\
+ $(MAKE) -C build-$$version install DESTDIR=$(CURDIR)/debian/tmp;\
done
+
+ set -e; \
+ for version in ${PYTHONS}; do \
+ $(MAKE) -C dbg-build-$$version install DESTDIR=$(CURDIR)/debian/python-kde3-dbg;\
+ done
+
dh_install -a --sourcedir=$(CURDIR)/debian/tmp
+
+ mkdir -p $(CURDIR)/debian/python-kde3/usr/lib/
+ ln -s /usr/lib/kde3/libkonsolepart.so $(CURDIR)/debian/python-kde3/usr/lib/
+ 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 {} \;
+
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
@@ -103,7 +130,11 @@
dh_installdocs -A THANKS
dh_installexamples
dh_link
- dh_strip
+ifeq (,$(findstring -i, $(DH_OPTIONS)))
+ DH_OPTIONS= dh_strip -ppython-kde3 --dbg-package=python-kde3-dbg
+ rm -rf debian/python-kde3-dbg/usr/share/doc/python-kde3-dbg
+ ln -s python-kde3 debian/python-kde3-dbg/usr/share/doc/python-kde3-dbg
+endif
dh_compress -X.py -X.ui -X.dtd
dh_fixperms
DH_PYCENTRAL=nomove dh_pycentral
More information about the Python-modules-commits
mailing list