[SCM] oxygen-icons5 packaging branch, master, updated. 65aa7282c9308bff4eb18902a83fc503e5f60030

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/oxygen-icons5.git;a=commitdiff;h=1f01e31

The following commit has been merged in the master branch:
commit 1f01e31f5356ce0b1e9caa2a4f39f065d74a524f
Author: Eckhart Wörner <ewoerner at kde.org>
Date:   Fri Apr 2 17:43:15 2010 +0000

    Use cmake support in debhelper 7.3+, get rid of cdbs dependency
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 debian/rules     | 7 ++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8cf44d2..71615a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ oxygen-icons (4:4.4.2-0rc1) UNRELEASED; urgency=low
 
   * 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
diff --git a/debian/control b/debian/control
index 8fd9063..c14a354 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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_
diff --git a/debian/rules b/debian/rules
index 2510b82..beb8112 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 

-- 
oxygen-icons5 packaging