Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

14 files changed, 19 insertions, 63 deletions

diff --git a/ubuntu/maverick/applications/amarok/debian/control b/ubuntu/maverick/applications/amarok/debian/control
index 9805dce74..0f2456165 100644
--- a/ubuntu/maverick/applications/amarok/debian/control
+++ b/ubuntu/maverick/applications/amarok/debian/control
@@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 5.0.0), quilt, bzip2,
  tdelibs4-trinity-dev,
  libxine-dev, libdbus-tqt-1-dev,
  libtag1-dev, libsqlite3-dev,
- libmysqlclient15-dev | libmysqlclient16-dev, libpq-dev,
+ libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, libpq-dev,
  libvisual-0.4-dev, libsdl1.2-dev,
  libifp-dev, libusb-dev, libgpod-nogtk-dev (>= 0.4.2), libnjb-dev, libmtp-dev,
  ruby, ruby1.8-dev,
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/maverick/applications/kchmviewer/debian/control
index dfb229d24..7e5b19c42 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/maverick/applications/kchmviewer/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Jose Luis Tallon <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, libchm-dev, dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-trinity-dev, libchm-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://www.kchmviewer.net/
 
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/rules b/ubuntu/maverick/applications/kchmviewer/debian/rules
index 72c3fd5bb..a496effa9 100755
--- a/ubuntu/maverick/applications/kchmviewer/debian/rules
+++ b/ubuntu/maverick/applications/kchmviewer/debian/rules
@@ -42,11 +42,10 @@ endif
 
 -include debian/debiandirs
 
-build: patch debian/build-kde
+build: debian/build-kde
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
+debian/build-kde:
+	dh_testdir
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -54,15 +53,6 @@ patch-stamp:
 	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 	
 	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-	touch patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	$(RM) -rf patch-stamp debian/patched
-
-debian/build-kde:
-	dh_testdir
 #	automake
 #	autoconf
 	test -e config.sub -a -L config.sub || \
@@ -74,7 +64,7 @@ debian/build-kde:
 	$(MAKE) -C build-kde
 	touch debian/build-kde
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	$(RM) -f build-stamp 
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
index 2dc15fe7f..c7485931c 100644
--- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
@@ -9,4 +9,4 @@ diff -Nur kerry-0.2.1/kerry/src/Makefile.am kerry-0.2.1.new/kerry/src/Makefile.a
 +autostart_DATA = kerry.autostart.desktop
  
  shutdowndir = $(prefix)/bin
- shutdown_SCRIPTS = beagled-shutdown.sh
+ shutdown_SCRIPTS = beagled-shutdown
diff --git a/ubuntu/maverick/applications/knights/debian/control b/ubuntu/maverick/applications/knights/debian/control
index 0e64bc23f..8c281d27e 100644
--- a/ubuntu/maverick/applications/knights/debian/control
+++ b/ubuntu/maverick/applications/knights/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Jose Carlos Medeiros <[email protected]>
 Uploaders: Ola Lundqvist <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), tdelibs4-trinity-dev, poxml, dpatch, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, tdelibs4-trinity-dev, poxml, imagemagick, libx11-dev, libxext-dev, libxinerama-dev, libxpm-dev, x-dev | x11proto-core-dev | libx11-dev, libasound2-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 Homepage: http://knights.sourceforge.net/
 
diff --git a/ubuntu/maverick/applications/knights/debian/rules b/ubuntu/maverick/applications/knights/debian/rules
index fc447c09a..7bbbd796f 100755
--- a/ubuntu/maverick/applications/knights/debian/rules
+++ b/ubuntu/maverick/applications/knights/debian/rules
@@ -18,7 +18,6 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-include /usr/share/dpatch/dpatch.make
 
 CFLAGS = -Wall -g
 
@@ -37,7 +36,7 @@ debian/knights.xpm: media/hi32-app-knights.png
 	convert $< $@
 
 
-config.status: configure patch
+config.status: configure
 	dh_testdir
 
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
@@ -61,9 +60,7 @@ build-stamp:  config.status debian/knights.xpm
 	$(MAKE)
 	touch build-stamp
 
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f po/de.gmo
diff --git a/ubuntu/maverick/applications/koffice/debian/control b/ubuntu/maverick/applications/koffice/debian/control
index b48e508be..d6984e7eb 100644
--- a/ubuntu/maverick/applications/koffice/debian/control
+++ b/ubuntu/maverick/applications/koffice/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <[email protected]>
 Uploaders: Ana Beatriz Guerrero Lopez <[email protected]>, Ral Snchez Siles <[email protected]>
-Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.52ubuntu18), debhelper (>= 5), binutils (>= 2.14.90.0.7), recode, docbook-to-man, gawk, gettext, flex, tdelibs4-trinity-dev (>= 4:3.4.3), libaspell-dev, libfontconfig1-dev, libopenexr-dev, libpaper-dev, libreadline5-dev | libreadline6-dev, libtiff4-dev, libwv2-dev (>= 0.2.2-4), libxml2-dev, libxslt1-dev, python-dev, ruby (>= 1.8.0), ruby1.8-dev, libwpd8-dev, libpqxx-dev | libpqxx3-dev, libmysqlclient15-dev | libmysqlclient16-dev | libmysqlclient18-dev, sharutils, bzip2, libpoppler-tqt-dev, libexif-dev, libasound2-dev, libogg-dev-la, automake, autoconf, libtool, libltdl-dev
 Build-Depends-Indep: libtqtinterface-doc, graphviz, gsfonts-x11
 Standards-Version: 3.8.4
 Homepage: http://www.koffice.org
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/control b/ubuntu/maverick/applications/ksquirrel/debian/control
index d2c01e591..2c9b9b633 100644
--- a/ubuntu/maverick/applications/ksquirrel/debian/control
+++ b/ubuntu/maverick/applications/ksquirrel/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Timothy Pearson <[email protected]>
 XSBC-Original-Maintainer: Paul Gevers <[email protected]>
 Build-Depends: debhelper (>= 5),
-               dpatch,
+               quilt,
                libksquirrel-trinity-dev,
                libkonq4-trinity-dev,
                kipi-plugins-trinity,
diff --git a/ubuntu/maverick/applications/ksquirrel/debian/rules b/ubuntu/maverick/applications/ksquirrel/debian/rules
index 8f8161523..797fc4a08 100755
--- a/ubuntu/maverick/applications/ksquirrel/debian/rules
+++ b/ubuntu/maverick/applications/ksquirrel/debian/rules
@@ -22,7 +22,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-config.status: patch configure
+config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -54,37 +54,17 @@ build-stamp:  config.status
 
 	touch $@
 
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 
-	! [ -f /usr/share/libtool/ltmain.sh ] || \
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
-	make -f admin/Makefile.common cvs
-
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.sub config.guess
 
 	dh_clean 
 
-patch: patch-stamp
-
-patch-stamp:
-	dpatch apply-all
-	dpatch cat-all >patch-stamp
-
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 install: build
 	dh_testdir
 	dh_testroot
diff --git a/ubuntu/maverick/applications/ktechlab/debian/control b/ubuntu/maverick/applications/ktechlab/debian/control
index 4b14b24b4..765916f8a 100644
--- a/ubuntu/maverick/applications/ktechlab/debian/control
+++ b/ubuntu/maverick/applications/ktechlab/debian/control
@@ -2,7 +2,7 @@ Source: ktechlab-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>= 6.0.0), imagemagick, tdelibs4-trinity-dev, dpatch, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 6.0.0), quilt, imagemagick, tdelibs4-trinity-dev, gpsim-dev (>= 0.21.11-2), libgtk2.0-dev, libreadline6-dev, libopts25-dev, chrpath, libpopt-dev, tdesdk-scripts-trinity, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktechlab-trinity
diff --git a/ubuntu/maverick/applications/ktechlab/debian/rules b/ubuntu/maverick/applications/ktechlab/debian/rules
index 1e1e53c9c..40b9f2d14 100755
--- a/ubuntu/maverick/applications/ktechlab/debian/rules
+++ b/ubuntu/maverick/applications/ktechlab/debian/rules
@@ -28,7 +28,6 @@ debian/ktechlab.xpm: icons/hi32-app-ktechlab.png
 
 config.status: configure.in
 	dh_testdir
-	dpatch apply-all
 
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
@@ -63,8 +62,6 @@ clean:
 	dh_testroot
 	rm -f build-stamp
 	[ ! -f po/Makefile ] || $(MAKE) -C po clean
-	dpatch deapply-all
-	rm -rf debian/patched
 
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
diff --git a/ubuntu/maverick/applications/ktorrent/debian/control b/ubuntu/maverick/applications/ktorrent/debian/control
index ea953a555..3918b6093 100644
--- a/ubuntu/maverick/applications/ktorrent/debian/control
+++ b/ubuntu/maverick/applications/ktorrent/debian/control
@@ -2,7 +2,7 @@ Source: ktorrent-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5.0), cdbs, docbook2x, tdelibs4-trinity-dev, libpcre3-dev, libx11-dev, libgmp3-dev, libavahi-tqt-dev, libgeoip-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: ktorrent-trinity
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/control b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
index 540fbebf2..0b5857188 100644
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/control
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/control
@@ -2,7 +2,7 @@ Source: tde-style-lipstik-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>= 4.0.0), tdelibs4-trinity-dev (>= 4:3.2), dpatch, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 4.0.0), quilt, tdelibs4-trinity-dev (>= 4:3.2), automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tde-style-lipstik-trinity
diff --git a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
index b20ff9228..f24b21716 100755
--- a/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
+++ b/ubuntu/maverick/applications/tde-style-lipstik/debian/rules
@@ -51,8 +51,7 @@ build-stamp:  config.status
 
 	touch build-stamp
 
-clean: clean-patched unpatch
-clean-patched:
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -70,10 +69,7 @@ endif
 
 	dh_clean 
 
-patch: patch-stamp
-patch-stamp:
-	dpatch apply-all
-	#dpatch call-all -a=pkg-info > patch-stamp
+patch:
 	! [ -f /usr/share/libtool/ltmain.sh ] || \
 	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
 	! [ -f /usr/share/libtool/config/ltmain.sh ] || \
@@ -83,10 +79,6 @@ patch-stamp:
 	make -f admin/Makefile.common cvs
 	touch debian/stamp-bootstrap
 
-unpatch:
-	dpatch deapply-all
-	rm -rf patch-stamp debian/patched
-
 install: build
 	dh_testdir
 	dh_testroot