[Pkg-maemo-commits] r10 ./hildon-fm-l10n/debian: * Cleanup rules.

[Loïc Minier]

------------------------------------------------------------
revno: 10
committer: Loïc Minier <lool at dooz.org>
branch nick: debian
timestamp: Tue 2007-07-24 16:11:35 +0200
message:
  * Cleanup rules.
  * Cleanup control; wrap build-deps and deps.
modified:
  debian/changelog
  debian/control
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2007-07-24 13:04:28 +0000
+++ b/debian/changelog	2007-07-24 14:11:35 +0000
@@ -2,8 +2,10 @@
 
   * Set maintainer to Debian Maemo Maintainers; add Jonny Lamb and myself as
     uploaders.
+  * Cleanup rules.
+  * Cleanup control; wrap build-deps and deps.
 
- -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 15:04:09 +0200
+ -- Loic Minier <lool at dooz.org>  Tue, 24 Jul 2007 16:11:29 +0200
 
 hildon-fm-l10n (3.0-sardine1ubuntu2) gutsy; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2007-07-24 13:04:28 +0000
+++ b/debian/control	2007-07-24 14:11:35 +0000
@@ -3,8 +3,10 @@
 Priority: optional
 Maintainer: Debian Maemo Maintainers <pkg-maemo-maintainers at lists.alioth.debian.org>
 XSBC-Original-Maintainer: L10n Team <l10n at maemo.org>
-Uploaders: Loic Minier <lool at dooz.org>, Jonny Lamb <jonnylamb at jonnylamb.com>
-Build-Depends: debhelper (>= 4.0.0), gettext
+Uploaders: Loic Minier <lool at dooz.org>,
+           Jonny Lamb <jonnylamb at jonnylamb.com>
+Build-Depends: debhelper (>= 4.0.0),
+               gettext
 Standards-Version: 3.6.2
 
 Package: hildon-fm-l10n-english
@@ -18,8 +20,6 @@
 
 Package: hildon-fm-l10n-engb
 Architecture: all
-Provides: 
-Conflicts: 
 Description: hildon-fm engb locale
  engb locale for hildon-fm.
 

=== modified file 'debian/rules'
--- a/debian/rules	2006-05-18 20:47:30 +0000
+++ b/debian/rules	2007-07-24 14:11:35 +0000
@@ -6,23 +6,23 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-TEXT_DOMAIN=$(shell sed -n 's/^Source: \(.*\)-l10n$$/\1/; t e; b; :e; p; q' debian/control)
-LANGS=$(shell echo po/*.po|sed -e 's,po/,,g' -e 's/.po//g')
+TEXT_DOMAIN := $(shell dpkg-parsechangelog | sed -n 's/^Source: \(.*\)-l10n$$/\1/p')
+LANGS = $(shell echo po/*.po | sed -e 's,^po/,,; s/\.po$$//')
 
-#FMTPARAMS=--verbose -c
-FMTPARAMS=--statistics
+#FMTPARAMS := --verbose -c
+FMTPARAMS := --statistics
 
 build: build-stamp
-	sh -c 'a=0; for lang in $(LANGS); do msgfmt -o /dev/null -c po/$$lang.po || a=1; done; if [ $$a = 1 ]; then exit 1; fi'
+	sh -c -e 'for lang in $(LANGS); do msgfmt -o /dev/null -c po/$$lang.po; done'
 	msgfmt -o /dev/null -c po/$(TEXT_DOMAIN).pot
 
 build-stamp:
-	touch build-stamp
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 	dh_clean
 
 install: build
@@ -30,31 +30,29 @@
 	dh_testroot
 	dh_installdirs
 	dh_clean -k
-
-	@for lang in $(LANGS) ; do \
+	@for lang in $(LANGS); do \
 		targetdir="$(CURDIR)/debian/$(TEXT_DOMAIN)-l10n-`echo $$lang|tr [A-Z] [a-z]|tr -d _`/usr/share/locale/$$lang/LC_MESSAGES" ;\
-		[ -d "$$targetdir" ] || mkdir -p $$targetdir ; \
+		mkdir -p $$targetdir; \
 		echo -n "$$lang.po: "; \
 		msgfmt -v $(FMTPARAMS) po/$$lang.po -o $$targetdir/$(TEXT_DOMAIN).mo || exit 1; \
 	done
-
-	@targetdir="$(CURDIR)/debian/$(TEXT_DOMAIN)-l10n-english/usr/share/locale/en_GB/LC_MESSAGES" ;\
-		[ -d "$$targetdir" ] || mkdir -p $$targetdir ; \
+	@targetdir="$(CURDIR)/debian/$(TEXT_DOMAIN)-l10n-english/usr/share/locale/en_GB/LC_MESSAGES"; \
+		mkdir -p $$targetdir ; \
 		echo -n "$(TEXT_DOMAIN).pot: "; \
-		msgfmt -v -a $(FMTPARAMS) po/$(TEXT_DOMAIN).pot -o $$targetdir/$(TEXT_DOMAIN).mo ;
+		msgfmt -v -a $(FMTPARAMS) po/$(TEXT_DOMAIN).pot -o $$targetdir/$(TEXT_DOMAIN).mo
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
 
 binary: binary-indep
-.PHONY: clean binary-indep binary install 
+.PHONY: clean binary-indep binary install