[SCM] KDE Localization module packaging branch, master, updated. debian/4.6.4-1-10-gf4cb49e

Modestas Vainius modax at alioth.debian.org
Mon Jul 18 18:16:10 UTC 2011


The following commit has been merged in the master branch:
commit 7680617077c26e2e6113b63a63e4a19e4df4e6cc
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Jul 18 15:40:05 2011 +0300

    Use dh_auto_* tools in debian/rules wherever it makes sense.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |    7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9c27b23..b9f1ac7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kde-l10n (4:4.6.5-0r1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bump kde-sc-dev-latest build-dependency to 4:4.6.5.
+  * Use dh_auto_* tools in debian/rules wherever it makes sense.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 04 Jul 2011 11:54:22 +0300
 
diff --git a/debian/control b/debian/control
index b5aff55..8dd78bf 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: Modestas Vainius <modax at debian.org>, José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.5),
- cmake, debhelper (>= 7), bzip2, kdelibs5-dev (>= 4:4.6)
+ cmake, debhelper (>= 7.3.16), bzip2, kdelibs5-dev (>= 4:4.6)
 Standards-Version: 3.9.2
 Homepage: http://i18n.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kde-l10n.git
diff --git a/debian/rules b/debian/rules
index 4be445c..d969516 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,9 +51,8 @@ build: $(STAMP_BUILD)
 
 $(STAMP_BUILD): | prepare_build
 	# Building the '$(cur_lang)' language ...
-	mkdir $(cur_lang_builddir); cd $(cur_lang_builddir) && \
-	    cmake .. -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_VERBOSE_MAKEFILE=ON && \
-	    $(MAKE)
+	dh_auto_configure -Scmake -D$(cur_lang) -B$(cur_lang_builddir) -- -DCMAKE_BUILD_TYPE=Debian
+	$(MAKE) -C $(cur_lang_builddir)
 	touch $@
 
 prepare_install:
@@ -66,7 +65,7 @@ install: $(L10N_INSTALL)
 
 $(L10N_INSTALL): | prepare_install
 	# Installing '$(cur_lang)' to the '$(cur_pkg)' package
-	cd $(cur_lang_builddir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/$(cur_pkg)
+	dh_auto_install -Scmake -D$(cur_lang) -B$(cur_lang_builddir) --destdir=$(CURDIR)/debian/$(cur_pkg)
 
 prepare_clean:
 	dh_testdir

-- 
KDE Localization module packaging



More information about the pkg-kde-commits mailing list