rev 3400 - kde-extras/guidance/branches/kubuntu/debian

Fathi Boudra fboudra-guest at costa.debian.org
Wed Mar 29 15:23:20 UTC 2006


Author: fboudra-guest
Date: 2006-03-29 15:23:19 +0000 (Wed, 29 Mar 2006)
New Revision: 3400

Removed:
   kde-extras/guidance/branches/kubuntu/debian/manpages
Modified:
   kde-extras/guidance/branches/kubuntu/debian/changelog
   kde-extras/guidance/branches/kubuntu/debian/control
   kde-extras/guidance/branches/kubuntu/debian/dirs
   kde-extras/guidance/branches/kubuntu/debian/rules
Log:
sync guidance for kubuntu

Modified: kde-extras/guidance/branches/kubuntu/debian/changelog
===================================================================
--- kde-extras/guidance/branches/kubuntu/debian/changelog	2006-03-29 15:21:38 UTC (rev 3399)
+++ kde-extras/guidance/branches/kubuntu/debian/changelog	2006-03-29 15:23:19 UTC (rev 3400)
@@ -1,3 +1,10 @@
+kde-guidance (0.6.4-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Fathi Boudra ]
+  * Converted to CDBS
+
+ -- Fathi Boudra <fboudra at free.fr>  Wed, 29 Mar 2006 17:22:21 +0100
+
 kde-guidance (0.6.3-0ubuntu1) dapper; urgency=low
 
   [ Fathi Boudra ]

Modified: kde-extras/guidance/branches/kubuntu/debian/control
===================================================================
--- kde-extras/guidance/branches/kubuntu/debian/control	2006-03-29 15:21:38 UTC (rev 3399)
+++ kde-extras/guidance/branches/kubuntu/debian/control	2006-03-29 15:23:19 UTC (rev 3400)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Fathi Boudra <fboudra at free.fr>
-Build-Depends: debhelper (>= 5.0.0), chrpath, kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev
+Build-Depends: cdbs, debhelper (>= 5.0.0), chrpath, kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev
 Standards-Version: 3.6.2
 
 Package: kde-guidance

Modified: kde-extras/guidance/branches/kubuntu/debian/dirs
===================================================================
--- kde-extras/guidance/branches/kubuntu/debian/dirs	2006-03-29 15:21:38 UTC (rev 3399)
+++ kde-extras/guidance/branches/kubuntu/debian/dirs	2006-03-29 15:23:19 UTC (rev 3400)
@@ -1,7 +1 @@
-usr/bin
-usr/lib
-usr/lib/python2.4/site-packages
-usr/share/apps/guidance
-usr/share/doc/kde/HTML/en/guidance
-usr/share/icons/crystalsvg/32x32/apps
 var/lib/guidance

Deleted: kde-extras/guidance/branches/kubuntu/debian/manpages

Modified: kde-extras/guidance/branches/kubuntu/debian/rules
===================================================================
--- kde-extras/guidance/branches/kubuntu/debian/rules	2006-03-29 15:21:38 UTC (rev 3399)
+++ kde-extras/guidance/branches/kubuntu/debian/rules	2006-03-29 15:23:19 UTC (rev 3400)
@@ -1,86 +1,49 @@
 #!/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/class/python-distutils.mk
 
-PYTHONVERS = python2.4
+DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1  debian/mountconfig.1  debian/serviceconfig.1  debian/userconfig.1
+DEB_PYTHON_INSTALL_ARGS_kde-guidance = --prefix=/usr --root=$(CURDIR)/debian/kde-guidance
 
-CFLAGS = -Wall -g
+PYTHONVERS = 2.4
 
-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 -rf doc/en/*html doc/en/*bz2
-	rm -f serviceconfig/kcm_serviceconfig.cpp 
-	rm -f mountconfig/kcm_mountconfig.cpp 
-	rm -f displayconfig/kcm_displayconfig.cpp 
-	rm -f userconfig/kcm_userconfig.cpp
-	rm -f install_log.txt
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	/usr/bin/python setup.py install --prefix=/usr --root=$(CURDIR)/debian/kde-guidance
-
+install/kde-guidance::
 	# put python modules in /usr/lib, debian policy compliance
-	mv debian/kde-guidance/usr/share/apps/guidance/*py debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages
-	mv debian/kde-guidance/usr/share/apps/guidance/*pyc debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages
+	mv debian/kde-guidance/usr/share/apps/guidance/*py debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages
+	mv debian/kde-guidance/usr/share/apps/guidance/*pyc debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages
 
 	# redo the link properly
-	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/displayconfig.py displayconfig)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/displayconfig-restore.py displayconfig-restore)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/mountconfig.py mountconfig)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/serviceconfig.py serviceconfig)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/userconfig.py userconfig)
+	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/displayconfig.py displayconfig)
+	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/displayconfig-restore.py displayconfig-restore)
+	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/mountconfig.py mountconfig)
+	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/serviceconfig.py serviceconfig)
+	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/userconfig.py userconfig)
 
 	# remove script-not-executable
-	chmod +x debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/*.py
-	chmod +x debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/*.py
+	chmod +x debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/*.py
+	chmod +x debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/*.py
 
 	# remove executable-not-elf-or-script. some remains need to be fixed in upstream
 	chmod 0644 debian/kde-guidance/usr/share/apps/guidance/pics/*.png
 	chmod 0644 debian/kde-guidance/usr/share/applications/kde/*.desktop
 	chmod 0644 debian/kde-guidance/usr/share/icons/crystalsvg/16x16/apps/*.png
 
-	chmod 0644 debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/ScanPCI.py
-	chmod 0644 debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/SimpleCommandRunner.py
-	chmod 0644 debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/SMBShareSelectDialog.py
-	chmod 0644 debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/displayconfigwidgets.py
-	chmod 0644 debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/fuser_ui.py
+	chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/ScanPCI.py
+	chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/SimpleCommandRunner.py
+	chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/SMBShareSelectDialog.py
+	chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/displayconfigwidgets.py
+	chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/fuser_ui.py
 
 	# copy icons to right place
-	cp debian/kde-guidance/usr/share/apps/guidance/pics/hi32-app-daemons.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/daemons.png
-	cp debian/kde-guidance/usr/share/apps/guidance/pics/kcmpartitions.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
-	cp debian/kde-guidance/usr/share/apps/guidance/pics/hi32-user.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
-	cp debian/kde-guidance/usr/share/apps/guidance/pics/hi32-display.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
+	install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-app-daemons.png \
+		debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/daemons.png
+	install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/kcmpartitions.png \
+		debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+	install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-user.png \
+		debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
+	install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-display.png \
+		debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
 
 	# install displayconfig-hwprobe.py script
 	install -D -p -m0755 displayconfig/displayconfig-hwprobe.py debian/kde-guidance/etc/init.d/displayconfig-hwprobe.py
@@ -91,28 +54,13 @@
 	# remove binary-or-shlib-defines-rpath
 	chrpath -d debian/kde-guidance/usr/lib/kde3/kcm_*.so.*
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+clean::
+	rm -rf build
 
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_python
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	rm -rf doc/en/*html doc/en/*bz2
+	rm -f serviceconfig/kcm_serviceconfig.cpp 
+	rm -f mountconfig/kcm_mountconfig.cpp 
+	rm -f displayconfig/kcm_displayconfig.cpp 
+	rm -f userconfig/kcm_userconfig.cpp
+	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