rev 7363 - in kde-extras/pykdeextensions/trunk/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sun Oct 7 16:37:04 UTC 2007
Author: fboudra-guest
Date: 2007-10-07 16:37:04 +0000 (Sun, 07 Oct 2007)
New Revision: 7363
Added:
kde-extras/pykdeextensions/trunk/debian/patches/12_force_python_script.diff
kde-extras/pykdeextensions/trunk/debian/patches/series
kde-extras/pykdeextensions/trunk/debian/pykdeextensions.lintian-overrides
Modified:
kde-extras/pykdeextensions/trunk/debian/changelog
kde-extras/pykdeextensions/trunk/debian/control
kde-extras/pykdeextensions/trunk/debian/patches/10_qt_candidate_paths.diff
kde-extras/pykdeextensions/trunk/debian/patches/11_fix_get_libdir_name.diff
kde-extras/pykdeextensions/trunk/debian/pykdeextensions.install
kde-extras/pykdeextensions/trunk/debian/rules
Log:
* Build for python 2.4/2.5
Modified: kde-extras/pykdeextensions/trunk/debian/changelog
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/changelog 2007-10-07 15:16:55 UTC (rev 7362)
+++ kde-extras/pykdeextensions/trunk/debian/changelog 2007-10-07 16:37:04 UTC (rev 7363)
@@ -1,12 +1,11 @@
-pykdeextensions (0.4.0-5) UNRELEASED; urgency=low
+pykdeextensions (0.4.0-5) unstable; urgency=low
- * NOT RELEASED YET
-
* Add python-qt-dev build dependency.
pyqtconfig moved from python-qt3 to python-qt-dev. (Closes: #439504)
- * Revert previous pyversions. Build with python 2.4/2.5. (Closes: #424505)
- * Revert python-all-dev build dependency.
- * Remove 12_force_python2.4_script patch.
+ * Build with python 2.4/2.5. (Closes: #424505, #445292)
+ * Revert previous pyversions.
+ * Revert python-all-dev build dependency.
+ * Replace 12_force_python2.4_script patch.
* Remove *.py[co] files.
* lintian cleanup: substvar-source-version-is-deprecated.
Use ${binary:Version}.
Modified: kde-extras/pykdeextensions/trunk/debian/control
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/control 2007-10-07 15:16:55 UTC (rev 7362)
+++ kde-extras/pykdeextensions/trunk/debian/control 2007-10-07 16:37:04 UTC (rev 7363)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4c2a, libtool,
+Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, kdelibs4c2a, libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-kde3,
python-qt-dev, python-sip4-dev, python-support (>= 0.6), python-all-dev (>= 2.4)
Standards-Version: 3.7.2
@@ -33,7 +33,7 @@
Package: libpythonize0
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, python2.4-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, python-all-dev
Description: Python packages to support KDE applications (library)
PyKDE Extensions is a collection of software and Python packages
to support the creation and installation of KDE applications.
Modified: kde-extras/pykdeextensions/trunk/debian/patches/10_qt_candidate_paths.diff
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/patches/10_qt_candidate_paths.diff 2007-10-07 15:16:55 UTC (rev 7362)
+++ kde-extras/pykdeextensions/trunk/debian/patches/10_qt_candidate_paths.diff 2007-10-07 16:37:04 UTC (rev 7363)
@@ -1,6 +1,5 @@
-diff -Nur pykdeextensions-0.4.0/src/kdedistutils.py pykdeextensions-0.4.0.new/src/kdedistutils.py
---- pykdeextensions-0.4.0/src/kdedistutils.py 2005-09-19 21:15:13.000000000 +0200
-+++ pykdeextensions-0.4.0.new/src/kdedistutils.py 2006-06-07 18:53:18.000000000 +0200
+--- a/src/kdedistutils.py
++++ b/src/kdedistutils.py
@@ -572,6 +572,7 @@
canidatepaths.append("/opt/qt/include")
canidatepaths.append("/opt/qt/lib/include")
Modified: kde-extras/pykdeextensions/trunk/debian/patches/11_fix_get_libdir_name.diff
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/patches/11_fix_get_libdir_name.diff 2007-10-07 15:16:55 UTC (rev 7362)
+++ kde-extras/pykdeextensions/trunk/debian/patches/11_fix_get_libdir_name.diff 2007-10-07 16:37:04 UTC (rev 7363)
@@ -1,6 +1,5 @@
-diff -Nur pykdeextensions-0.4.0/src/kdedistutils.py pykdeextensions-0.4.0.new/src/kdedistutils.py
---- pykdeextensions-0.4.0/src/kdedistutils.py 2006-06-07 18:57:25.000000000 +0200
-+++ pykdeextensions-0.4.0.new/src/kdedistutils.py 2006-06-07 18:58:03.000000000 +0200
+--- a/src/kdedistutils.py
++++ b/src/kdedistutils.py
@@ -2184,7 +2184,7 @@
###########################################################################
Added: kde-extras/pykdeextensions/trunk/debian/patches/12_force_python_script.diff
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/patches/12_force_python_script.diff (rev 0)
+++ kde-extras/pykdeextensions/trunk/debian/patches/12_force_python_script.diff 2007-10-07 16:37:04 UTC (rev 7363)
@@ -0,0 +1,126 @@
+--- a/app_templates/kcontrol_module/setup.py
++++ b/app_templates/kcontrol_module/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # setup - description #
+ # ------------------------------ #
+--- a/app_templates/kcontrol_module/src/kcontrol_module.py
++++ b/app_templates/kcontrol_module/src/kcontrol_module.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # kcontrol_module - description #
+ # ------------------------------ #
+--- a/app_templates/kdeapp/setup.py
++++ b/app_templates/kdeapp/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # setup - description #
+ # ------------------------------ #
+--- a/app_templates/kdeapp/src/kdeapp.py
++++ b/app_templates/kdeapp/src/kdeapp.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # kdeapp - description #
+ # ------------------------------ #
+--- a/app_templates/kdeapp/src/kdeappiface.py
++++ b/app_templates/kdeapp/src/kdeappiface.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ ###########################################################################
+ # testappiface - description #
+ # ------------------------------ #
+--- a/app_templates/kdeapp/src/kdeappview.py
++++ b/app_templates/kdeapp/src/kdeappview.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ ###########################################################################
+ # kdeappview - description #
+ # ------------------------------ #
+--- a/app_templates/kdeapp/src/prefdialog.py
++++ b/app_templates/kdeapp/src/prefdialog.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # testapp - description #
+ # ------------------------------ #
+--- a/app_templates/kdeutility/setup.py
++++ b/app_templates/kdeutility/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # setup - description #
+ # ------------------------------ #
+--- a/app_templates/kdeutility/src/kdeutility.py
++++ b/app_templates/kdeutility/src/kdeutility.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # kdeutility - description #
+ # ------------------------------ #
+--- a/app_templates/kioslave/setup.py
++++ b/app_templates/kioslave/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # setup - description #
+ # ------------------------------ #
+--- a/app_templates/kioslave/src/kioslave.py
++++ b/app_templates/kioslave/src/kioslave.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # kioslave - description #
+ # ------------------------------ #
+--- a/setup.py
++++ b/setup.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # setup - description #
+ # ------------------------------ #
+--- a/src/kdedesigner.py
++++ b/src/kdedesigner.py
+@@ -1,4 +1,5 @@
+-###########################################################################
++#!/usr/bin/python
++############################################################################
+ # kdedesigner - description #
+ # ------------------------------ #
+ # begin : Thu Apr 21 2005 #
+--- a/src/kdedistutils.py
++++ b/src/kdedistutils.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # kdedistutils - description #
+ # ------------------------------ #
+--- a/src/qtdesigner.py
++++ b/src/qtdesigner.py
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ ###########################################################################
+ # qtdesigner - description #
+ # ------------------------------ #
+--- a/src/qtuicompiler.py
++++ b/src/qtuicompiler.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ ###########################################################################
+ # qtuicompiler - description #
+ # ------------------------------ #
Added: kde-extras/pykdeextensions/trunk/debian/patches/series
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/patches/series (rev 0)
+++ kde-extras/pykdeextensions/trunk/debian/patches/series 2007-10-07 16:37:04 UTC (rev 7363)
@@ -0,0 +1,3 @@
+10_qt_candidate_paths.diff
+11_fix_get_libdir_name.diff
+12_force_python_script.diff
Modified: kde-extras/pykdeextensions/trunk/debian/pykdeextensions.install
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/pykdeextensions.install 2007-10-07 15:16:55 UTC (rev 7362)
+++ kde-extras/pykdeextensions/trunk/debian/pykdeextensions.install 2007-10-07 16:37:04 UTC (rev 7363)
@@ -1,4 +1,3 @@
-usr/lib/python2.4/site-packages
usr/share/apps/pykdeextensions/AUTHORS
usr/share/apps/pykdeextensions/ChangeLog
usr/share/apps/pykdeextensions/INSTALL
Added: kde-extras/pykdeextensions/trunk/debian/pykdeextensions.lintian-overrides
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/pykdeextensions.lintian-overrides (rev 0)
+++ kde-extras/pykdeextensions/trunk/debian/pykdeextensions.lintian-overrides 2007-10-07 16:37:04 UTC (rev 7363)
@@ -0,0 +1,10 @@
+pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
+pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell
+pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
+pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
+
+pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
+pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
Modified: kde-extras/pykdeextensions/trunk/debian/rules
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/rules 2007-10-07 15:16:55 UTC (rev 7362)
+++ kde-extras/pykdeextensions/trunk/debian/rules 2007-10-07 16:37:04 UTC (rev 7363)
@@ -1,25 +1,35 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport
-DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
+DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+
install/pykdeextensions::
+ for version in `pyversions -s`; do \
+ for file in `ls debian/tmp/usr/lib/$${version}/site-packages`; do \
+ install -D -p -m 0644 debian/tmp/usr/lib/$${version}/site-packages/$${file} \
+ debian/pykdeextensions/usr/lib/$${version}/site-packages/$${file};\
+ done \
+ done
+
+ # remove byte-compiled file
+ find . -type f -name '*.py[co]' | xargs rm -f
+
# remove extra-license-file
- rm -f debian/tmp/usr/share/apps/pykdeextensions/app_templates/kdeutility/COPYING
- rm -f debian/tmp/usr/share/apps/pykdeextensions/app_templates/kdeapp/COPYING
- rm -f debian/tmp/usr/share/apps/pykdeextensions/app_templates/kcontrol_module/COPYING
- rm -f debian/tmp/usr/share/apps/pykdeextensions/app_templates/kioslave/COPYING
+ find debian -type f -name 'COPYING' | xargs rm -f
# fix script-not-executable
- chmod 0755 debian/tmp/usr/lib/python2.4/site-packages/qtuicompiler.py
- chmod 0755 debian/tmp/usr/lib/python2.4/site-packages/kdedistutils.py
- chmod 0755 debian/tmp/usr/share/apps/pykdeextensions/app_templates/kdeapp/src/prefdialog.py
+ find debian -type f -name '*.py' | xargs chmod 0755
+ # install lintian overrides
+ install -D -p -m0644 debian/pykdeextensions.lintian-overrides \
+ debian/pykdeextensions/usr/share/lintian/overrides/pykdeextensions
+
install/libpythonize0::
# fix binary-or-shlib-defines-rpath
chrpath -d debian/tmp/usr/lib/libpythonize.so.*
More information about the pkg-kde-commits
mailing list