[Pkg-kde-commits] rev 2047 - branches/kde-3.4.0/packages/kdebindings/debian

Adeodato Simó adeodato at costa.debian.org
Wed Oct 19 21:46:23 UTC 2005


Author: adeodato
Date: 2005-10-19 21:46:22 +0000 (Wed, 19 Oct 2005)
New Revision: 2047

Modified:
   branches/kde-3.4.0/packages/kdebindings/debian/changelog
   branches/kde-3.4.0/packages/kdebindings/debian/control
   branches/kde-3.4.0/packages/kdebindings/debian/python-dcop.install
   branches/kde-3.4.0/packages/kdebindings/debian/rules
Log:
Build-depend on python-dev instead of python2.3-dev, and determine
dependencies of python-dcop with dh_python's ${python:Depends}, so that
a simple rebuild is enough to transition to a new default python
version. Introduce a wilcard in the .install file, and don't pass a
hardcoded path to ./configure.


Modified: branches/kde-3.4.0/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-19 21:42:26 UTC (rev 2046)
+++ branches/kde-3.4.0/packages/kdebindings/debian/changelog	2005-10-19 21:46:22 UTC (rev 2047)
@@ -12,6 +12,12 @@
     upload closes: #332864, since we no longer build-depend on unavailable
     libgcj4-dev.
 
+  * Build-depend on python-dev instead of python2.3-dev, and determine
+    dependencies of python-dcop with dh_python's ${python:Depends}, so that a
+    simple rebuild is enough to transition to a new default python version.
+    Introduce a wilcard in the .install file, and don't pass a hardcoded path
+    to ./configure.
+
   * Install python-dcop examples. (Closes: #303654)
 
   * CDBSized debian/rules, to match the rest of KDE packages.

Modified: branches/kde-3.4.0/packages/kdebindings/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/control	2005-10-19 21:42:26 UTC (rev 2046)
+++ branches/kde-3.4.0/packages/kdebindings/debian/control	2005-10-19 21:46:22 UTC (rev 2047)
@@ -1,5 +1,5 @@
 Source: kdebindings
-Build-Depends: cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [!mips !mipsel], kdelibs4-dev (>= 4:3.3.2), libgtk1.2-dev, python2.3-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
+Build-Depends: cdbs (>= 0.4.27), debhelper (>> 4.0.0), gawk, gettext, java-gcj-compat-dev [!mips !mipsel], kdelibs4-dev (>= 4:3.3.2), libgtk1.2-dev, python-dev, libqt3-compat-headers (>= 3:3.3.3), ruby, ruby1.8-dev
 Section: devel
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -159,7 +159,7 @@
 Package: python-dcop
 Architecture: any
 Section: python
-Depends: ${shlibs:Depends}, python (>= 2.3), python (<< 2.4)
+Depends: ${python:Depends}, ${shlibs:Depends}
 Replaces: dcoppython
 Conflicts: dcoppython
 Description: DCOP bindings for Python

Modified: branches/kde-3.4.0/packages/kdebindings/debian/python-dcop.install
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/python-dcop.install	2005-10-19 21:42:26 UTC (rev 2046)
+++ branches/kde-3.4.0/packages/kdebindings/debian/python-dcop.install	2005-10-19 21:46:22 UTC (rev 2047)
@@ -1 +1 @@
-debian/tmp/usr/lib/python2.3/site-packages
+debian/tmp/usr/lib/*/site-packages

Modified: branches/kde-3.4.0/packages/kdebindings/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-19 21:42:26 UTC (rev 2046)
+++ branches/kde-3.4.0/packages/kdebindings/debian/rules	2005-10-19 21:46:22 UTC (rev 2047)
@@ -11,7 +11,6 @@
 # include debian/mipsen-xgot.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = $(WITH_JAVA) \
-			    --with-pythondir=/usr/lib/python2.3/site-packages \
 		  	    DO_NOT_COMPILE='dcopperl kalyptus qtsharp xparts python'
 
 DEB_COMPRESS_EXCLUDE += -X.java -X.ui -X.js -X.rb -X.map -X.wav
@@ -64,6 +63,9 @@
 	# Provide a Makefile for the example
 	cp $(DEB_BUILDDIR)/kjsembed/docs/embedding/simple-embed/Makefile kjsembed/docs/embedding/simple-embed
 
+binary-install/python-dcop::
+	dh_python -p$(cdbs_curpkg)
+
 binary-install::
 	for p in $(PACKAGES_WITH_USD_SYMLINK); do \
 	  rm -f debian/$$p/usr/share/doc/$$p/{copyright,changelog.Debian}; \




More information about the pkg-kde-commits mailing list