rev 17557 - trunk/packages/oxygen-icons/debian

[Eckhart Wörner]

Author: ewoerner-guest
Date: 2010-04-02 17:43:15 +0000 (Fri, 02 Apr 2010)
New Revision: 17557

Modified:
   trunk/packages/oxygen-icons/debian/changelog
   trunk/packages/oxygen-icons/debian/control
   trunk/packages/oxygen-icons/debian/rules
Log:
Use cmake support in debhelper 7.3+, get rid of cdbs dependency


Modified: trunk/packages/oxygen-icons/debian/changelog
===================================================================
--- trunk/packages/oxygen-icons/debian/changelog	2010-03-31 07:51:38 UTC (rev 17556)
+++ trunk/packages/oxygen-icons/debian/changelog	2010-04-02 17:43:15 UTC (rev 17557)
@@ -2,6 +2,9 @@
 
   * New upstream release.
 
+  [ Eckhart Wörner ]
+  * Use cmake support in debhelper 7.3+, get rid of cdbs dependency
+
  -- Modestas Vainius <modax at debian.org>  Sat, 27 Mar 2010 03:36:49 +0200
 
 oxygen-icons (4:4.4.1-1) experimental; urgency=low

Modified: trunk/packages/oxygen-icons/debian/control
===================================================================
--- trunk/packages/oxygen-icons/debian/control	2010-03-31 07:51:38 UTC (rev 17556)
+++ trunk/packages/oxygen-icons/debian/control	2010-04-02 17:43:15 UTC (rev 17557)
@@ -4,7 +4,7 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, cmake
+Build-Depends: debhelper (>= 7.3), cmake
 Standards-Version: 3.8.4
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/oxygen-icons/#_trunk_packages_oxygen-icons_

Modified: trunk/packages/oxygen-icons/debian/rules
===================================================================
--- trunk/packages/oxygen-icons/debian/rules	2010-03-31 07:51:38 UTC (rev 17556)
+++ trunk/packages/oxygen-icons/debian/rules	2010-04-02 17:43:15 UTC (rev 17557)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
+%:
+	dh $@
 
-binary-predeb/oxygen-icon-theme::
+override_dh_install:
+	dh_install
 	find $(CURDIR)/debian/oxygen-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty