[SCM] Debian Qt/KDE packaging tools branch, master, updated. master/0.4.11-13-g087f375

Modestas Vainius modax-guest at alioth.debian.org
Thu Aug 27 16:35:12 UTC 2009


The following commit has been merged in the master branch:
commit 2d010ab97ebc5db0ba71403e2a0a01814df52580
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Aug 27 19:27:57 2009 +0300

    Switch debian/rules to dh. Update build dependencies and compat accordingly.
---
 Makefile         |    3 +++
 debian/changelog |    2 ++
 debian/compat    |    2 +-
 debian/control   |    4 ++--
 debian/rules     |   33 ++-------------------------------
 5 files changed, 10 insertions(+), 34 deletions(-)

diff --git a/Makefile b/Makefile
index 26d34fe..2a355cb 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@ BINDIR := $(DESTDIR)/usr/bin
 MANDIR := $(DESTDIR)/usr/share/man
 #DATADIR := $(DESTDIR)/usr/share/pkg-kde-tools
 
+build:
+	# Nothing do build
+
 install:
 	install -d $(BINDIR) $(MANDIR)
 	
diff --git a/debian/changelog b/debian/changelog
index f99ca36..64f94ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ pkg-kde-tools (0.5.0~pre1) UNRELEASED; urgency=low
   * Deprecate debhelper/kde.mk snippet. Use kde build system/sequence addon
     instead.
   * Remove extra slashes from debian/install.
+  * Switch debian/rules to dh. Update build dependencies and compat
+    accordingly.
 
  -- Modestas Vainius <modestas at vainius.eu>  Thu, 27 Aug 2009 09:45:30 +0300
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 5f6f50c..13b0561 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pkg-kde-tools
 Section: devel
 Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.2
 Uploaders: Sune Vuorela <debian at pusling.com>, Modestas Vainius <modestas at vainius.eu>
 DM-Upload-Allowed: yes
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=summary
 Package: pkg-kde-tools
 Architecture: all
 Depends: ${perl:Depends}
-Suggests: debhelper (>= 7.3.0), cdbs, dpkg-dev (>= 1.15.0)
+Suggests: debhelper (>= 7.3.16), cdbs, dpkg-dev (>= 1.15.0)
 Breaks: dpkg-dev (<< 1.15.3), kdelibs5-dev (<< 4:4.2.2)
 Description: common makesnippets and build scripts for KDE4 related packages
  This package contains makefiles setting the default build arguments for KDE4
diff --git a/debian/rules b/debian/rules
index 2e143a5..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,4 @@
 #!/usr/bin/make -f
-build: 
-	#nop - just a set of scripts.
 
-clean: 
-	dh_testdir
-	dh_testroot
-	dh_clean 
-
-binary-arch: 
-	#policy requires this.
-
-binary-indep:
-	dh_testdir
-	dh_testroot
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/`dh_listpackages | head -n1`
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_install -X.svn
-	dh_installman
-	dh_link
-	dh_perl
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep
-.PHONY: clean binary-indep binary-arch binary build
+%:
+	dh $@

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list