rev 3908 - in kde-extras/pykdeextensions/trunk/debian: . patches

Fathi Boudra fboudra-guest at costa.debian.org
Wed Jun 7 17:21:14 UTC 2006


Author: fboudra-guest
Date: 2006-06-07 17:21:13 +0000 (Wed, 07 Jun 2006)
New Revision: 3908

Added:
   kde-extras/pykdeextensions/trunk/debian/libpythonize0-dev.install
   kde-extras/pykdeextensions/trunk/debian/libpythonize0.install
   kde-extras/pykdeextensions/trunk/debian/patches/
   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
Removed:
   kde-extras/pykdeextensions/trunk/debian/dirs
   kde-extras/pykdeextensions/trunk/debian/libpythonize0-dev.dirs
   kde-extras/pykdeextensions/trunk/debian/libpythonize0.dirs
Modified:
   kde-extras/pykdeextensions/trunk/debian/changelog
   kde-extras/pykdeextensions/trunk/debian/control
   kde-extras/pykdeextensions/trunk/debian/copyright
   kde-extras/pykdeextensions/trunk/debian/rules
Log:
Converted package to cdbs

Modified: kde-extras/pykdeextensions/trunk/debian/changelog
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/changelog	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/changelog	2006-06-07 17:21:13 UTC (rev 3908)
@@ -1,3 +1,14 @@
+pykdeextensions (0.4.0-2) unstable; urgency=low
+
+  * Converted package to cdbs
+  * Added 2 patches (thanks to Jonathan Riddell)
+    * 10_qt_candidate_paths.diff
+    * 11_fix_get_libdir_name.diff
+  * Updated control file
+  * Bumped debian policy version
+
+ -- Fathi Boudra <fboudra at free.fr>  Tue,  6 Jun 2006 08:56:40 +0200
+
 pykdeextensions (0.4.0-1) unstable; urgency=low
 
   [ Fathi Boudra ]

Modified: kde-extras/pykdeextensions/trunk/debian/control
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/control	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/control	2006-06-07 17:21:13 UTC (rev 3908)
@@ -2,23 +2,23 @@
 Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fboudra at free.fr>
-Build-Depends: debhelper (>= 5.0.0), chrpath, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-kde3, python-sip4-dev
-Standards-Version: 3.6.2
+Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
+Build-Depends: cdbs, debhelper (>= 5.0.0), chrpath, libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pyqt-tools, python-kde3, python-sip4-dev
+Standards-Version: 3.7.2
 
 Package: pykdeextensions
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${python:Depends}
 Description: Python packages to support KDE applications (scripts)
  PyKDE Extensions is a collection of software and Python packages
- to support the creation and installation of KDE applications.i
+ to support the creation and installation of KDE applications.
  .
   Homepage: http://www.simonzone.com/software/pykdeextensions
 
 Package: libpythonize0-dev
 Architecture: any
 Section: libdevel
-Depends: libpythonize0 (= ${Source-Version}), ${misc:Depends}, ${python:Depends}
+Depends: libpythonize0 (= ${Source-Version})
 Description: Python packages to support KDE applications (development)
  PyKDE Extensions is a collection of software and Python packages
  to support the creation and installation of KDE applications.
@@ -30,7 +30,7 @@
 Package: libpythonize0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python2.3-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, python2.3-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/copyright
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/copyright	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/copyright	2006-06-07 17:21:13 UTC (rev 3908)
@@ -3,7 +3,8 @@
 
 It was downloaded from <http://www.simonzone.com/software/pykdeextensions>
 
-Application templates and pykde helper modules copyright : Simon Edwards <simon at simonzone.com>
+Application templates and pykde helper modules copyright:
+   Simon Edwards <simon at simonzone.com>
 
 License:
 

Deleted: kde-extras/pykdeextensions/trunk/debian/dirs

Deleted: kde-extras/pykdeextensions/trunk/debian/libpythonize0-dev.dirs

Added: kde-extras/pykdeextensions/trunk/debian/libpythonize0-dev.install
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/libpythonize0-dev.install	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/libpythonize0-dev.install	2006-06-07 17:21:13 UTC (rev 3908)
@@ -0,0 +1,4 @@
+debian/tmp/usr/include/* usr/include
+debian/tmp/usr/lib/lib*.a usr/lib
+debian/tmp/usr/lib/lib*.la usr/lib
+debian/tmp/usr/lib/lib*.so usr/lib

Deleted: kde-extras/pykdeextensions/trunk/debian/libpythonize0.dirs

Added: kde-extras/pykdeextensions/trunk/debian/libpythonize0.install
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/libpythonize0.install	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/libpythonize0.install	2006-06-07 17:21:13 UTC (rev 3908)
@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.* usr/lib

Added: kde-extras/pykdeextensions/trunk/debian/patches/10_qt_candidate_paths.diff
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/patches/10_qt_candidate_paths.diff	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/patches/10_qt_candidate_paths.diff	2006-06-07 17:21:13 UTC (rev 3908)
@@ -0,0 +1,11 @@
+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
+@@ -572,6 +572,7 @@
+                 canidatepaths.append("/opt/qt/include")
+                 canidatepaths.append("/opt/qt/lib/include")
+                 canidatepaths.append("/opt/qt3/lib/include")
++		canidatepaths.append("/usr/include/qt3")
+                 self.qt_inc_dir = FindFileInPaths('qstring.h',canidatepaths)
+             if self.qt_inc_dir is None:
+                 raise SystemExit,"Failed to find the Qt header file directory"

Added: kde-extras/pykdeextensions/trunk/debian/patches/11_fix_get_libdir_name.diff
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/patches/11_fix_get_libdir_name.diff	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/patches/11_fix_get_libdir_name.diff	2006-06-07 17:21:13 UTC (rev 3908)
@@ -0,0 +1,14 @@
+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
+@@ -2184,7 +2184,7 @@
+ 
+ ###########################################################################
+ def get_libdir_name():
+-    if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
+-        return 'lib64'
+-    else:
++    #if os.uname()[4] in ['x86_64','mips64','ppc64','sparc64','s390x']:
++    #    return 'lib64'
++    #else:
+         return 'lib'

Added: kde-extras/pykdeextensions/trunk/debian/pykdeextensions.install
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/pykdeextensions.install	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/pykdeextensions.install	2006-06-07 17:21:13 UTC (rev 3908)
@@ -0,0 +1,7 @@
+AUTHORS usr/share/apps/pykdeextensions
+ChangeLog usr/share/apps/pykdeextensions
+INSTALL usr/share/apps/pykdeextensions
+NEWS usr/share/apps/pykdeextensions
+app_templates usr/share/apps/pykdeextensions
+doc/en/* usr/share/doc/kde/HTML/en/pykdeextensions
+debian/tmp/usr/lib/python2.3/site-packages/*.py usr/lib/python2.3/site-packages

Modified: kde-extras/pykdeextensions/trunk/debian/rules
===================================================================
--- kde-extras/pykdeextensions/trunk/debian/rules	2006-06-07 10:51:52 UTC (rev 3907)
+++ kde-extras/pykdeextensions/trunk/debian/rules	2006-06-07 17:21:13 UTC (rev 3908)
@@ -1,117 +1,33 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
 
-PYTHONVERS = 2.3
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	rm -rf build
-	rm -f src/*.pyc
-	rm -f doc/en/*html doc/en/*bz2
-	rm -f install_log.txt
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	/usr/bin/python$(PYTHONVERS) setup.py install --prefix=usr --root=$(CURDIR)/debian/pykdeextensions
-
-	# remove binary-or-shlib-defines-rpath
-	chrpath -d debian/pykdeextensions/usr/lib/lib*.so.*
-
-	# prepare libpythonize library packages
-	dh_install -plibpythonize0 debian/pykdeextensions/usr/lib/lib*.so.* usr/lib
-	
-	# prepare libpythonize development packages
-	dh_install -plibpythonize0-dev debian/pykdeextensions/usr/include/* usr/include
-	dh_install -plibpythonize0-dev debian/pykdeextensions/usr/lib/lib*.a usr/lib
-	dh_install -plibpythonize0-dev debian/pykdeextensions/usr/lib/lib*.la usr/lib
-	dh_install -plibpythonize0-dev debian/pykdeextensions/usr/lib/lib*.so usr/lib
-
-	# clean up pykdeextensions directory
-	rm -rf debian/pykdeextensions/usr/include
-	rm -f debian/pykdeextensions/usr/lib/lib*
-
-	# install the files like the standard setup
-	dh_install -ppykdeextensions doc/en/* usr/share/doc/kde/HTML/en/pykdeextensions
-	rm -f debian/pykdeextensions/usr/share/doc/kde/HTML/en/pykdeextensions/index.docbook
-
-	dh_install -ppykdeextensions AUTHORS usr/share/apps/pykdeextensions
-	dh_install -ppykdeextensions ChangeLog usr/share/apps/pykdeextensions
-	dh_install -ppykdeextensions INSTALL usr/share/apps/pykdeextensions
-	dh_install -ppykdeextensions NEWS usr/share/apps/pykdeextensions
-	dh_install -ppykdeextensions app_templates usr/share/apps/pykdeextensions
-
-	# remove package-installs-python-pyc
-	rm -f debian/pykdeextensions/usr/lib/python$(PYTHONVERS)/site-packages/*.pyc
-
+binary-install/pykdeextensions::
 	# remove extra-license-file
 	rm -f debian/pykdeextensions/usr/share/apps/pykdeextensions/app_templates/kdeutility/COPYING
 	rm -f debian/pykdeextensions/usr/share/apps/pykdeextensions/app_templates/kdeapp/COPYING
 	rm -f debian/pykdeextensions/usr/share/apps/pykdeextensions/app_templates/kcontrol_module/COPYING
 	rm -f debian/pykdeextensions/usr/share/apps/pykdeextensions/app_templates/kioslave/COPYING
-	rm -f debian/pykdeextensions/usr/share/apps/pykdeextensions/COPYING
 
 	# remove script-not-executable
-	chmod 0755 debian/pykdeextensions/usr/lib/python$(PYTHONVERS)/site-packages/*.py
+	chmod 0755 debian/pykdeextensions/usr/lib/python2.3/site-packages/*.py
 	chmod 0755 debian/pykdeextensions/usr/share/apps/pykdeextensions/app_templates/kdeapp/src/*.py
 
 	# fix permissions
-	chmod 0644 debian/pykdeextensions/usr/lib/python$(PYTHONVERS)/site-packages/kdedesigner.py
-	chmod 0644 debian/pykdeextensions/usr/lib/python$(PYTHONVERS)/site-packages/qtdesigner.py
+	chmod 0644 debian/pykdeextensions/usr/lib/python2.3/site-packages/kdedesigner.py
+	chmod 0644 debian/pykdeextensions/usr/lib/python2.3/site-packages/qtdesigner.py
 	chmod 0644 debian/pykdeextensions/usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeappiface.py
 	chmod 0644 debian/pykdeextensions/usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeappview.py
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-install/libpythonize0::
+	# remove binary-or-shlib-defines-rpath
+	chrpath -d debian/libpythonize0/usr/lib/lib*.so.*
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+clean::
+	rm -rf build
+	rm -f src/*.pyc
+	rm -f doc/en/*html doc/en/*bz2
+	rm -f install_log.txt
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure




More information about the pkg-kde-commits mailing list