rev 17808 - kde-extras/digikam/trunk/debian

[Mark Purcell]

Author: msp
Date: 2010-05-02 22:46:24 +0000 (Sun, 02 May 2010)
New Revision: 17808

Removed:
   kde-extras/digikam/trunk/debian/NEWS
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/rules
Log:
Upgrade to dh 7 - drop cdbs

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2010-05-02 22:01:22 UTC (rev 17807)
+++ kde-extras/digikam/trunk/debian/changelog	2010-05-02 22:46:24 UTC (rev 17808)
@@ -1,8 +1,9 @@
-digikam (2:1.2.0-2) UNRELEASED; urgency=low
+digikam (2:1.2.0-2) unstable; urgency=low
 
-  * Upload to unstable for KDE SC 4.4.3 (Closes: #579985, #577688, #569729)
+  * Upload to unstable for KDE SC 4.4.3 (Closes: #579985, #577688, #569729) 
+  * Upgrade to dh 7 - drop cdbs
 
- -- Mark Purcell <msp at debian.org>  Wed, 07 Apr 2010 22:12:50 +1000
+ -- Mark Purcell <msp at debian.org>  Mon, 03 May 2010 08:41:45 +1000
 
 digikam (2:1.2.0-1) experimental; urgency=low
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2010-05-02 22:01:22 UTC (rev 17807)
+++ kde-extras/digikam/trunk/debian/control	2010-05-02 22:46:24 UTC (rev 17808)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>
-Build-Depends: cdbs, debhelper (>= 7.2), pkg-kde-tools (>= 0.4.6), cmake (>= 2.6.2),
+Build-Depends: debhelper (>= 7.2), pkg-kde-tools (>= 0.4.6), cmake (>= 2.6.2), autotools-dev,
  kdelibs5-dev, kdepimlibs5-dev,
  libglib2.0-dev, libgphoto2-2-dev (>= 2.4),
- libkipi-dev, libkexiv2-7-dev, libkdcraw-dev, libmarble-dev (>= 4:4.4),
+ libkipi-dev, libkexiv2-dev, libkdcraw-dev, libmarble-dev (>= 4:4.4),
  liblcms1-dev, libtiff4-dev, libpng12-dev, liblqr-1-0-dev,
  libjasper-dev,
  liblensfun-dev,

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2010-05-02 22:01:22 UTC (rev 17807)
+++ kde-extras/digikam/trunk/debian/rules	2010-05-02 22:46:24 UTC (rev 17808)
@@ -1,30 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
--include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
+%:
+	dh --with kde $@
 
-TARBALL_EXT=tar.bz2
-
-DEB_CONFIGURE_EXTRA_FLAGS := --without-included-sqlite3
-DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-install/digikam::
-	# remove empty API-docs dirs tree
-	rm -rf $(CURDIR)/debian/digikam/usr/share/doc/kde
+override_dh_strip:
+	dh_strip -a --dbg-package=digikam-dbg