The following commit has been merged in the master branch:
commit a704fc300364f8f65b140ffcd620234800b0dad7
Author: Andreas Tille <[email protected]>
Date: Mon May 20 10:09:55 2013 +0200
use short dh syntax
diff --git a/debian/changelog b/debian/changelog
index ed05bb4..84618d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ blends (0.6.16.3) unstable; urgency=low
- Debhelper 9 (also d/compat)
* debian/rules:
- use dpkg-parsechangelog to obtain pkg name and version
+ - use short dh syntax
-- Andreas Tille <[email protected]> Sun, 31 Mar 2013 19:40:23 +0200
diff --git a/debian/rules b/debian/rules
index b40e4d9..0ed5dad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,56 +9,29 @@ pkg := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
VERSION := $(shell dpkg-parsechangelog -ldebian/changelog | grep Version: |
cut -f2 -d' ' | cut -f1 -d- )
DISTDIR := $(pkg)-$(VERSION)
-build: build-stamp
-build-stamp:
- dh_testdir
+%:
+ dh $@
+override_dh_auto_build:
cd doc; $(MAKE) html; $(MAKE) txt; $(MAKE) pdf
+ dh_auto_build
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- cd doc; $(MAKE) clean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean
- dh_installdirs
- dh_install
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
- # avoid installing doc directory for transitional packages
- dh_installchangelogs -p$(pkg)-dev -p$(pkg)-common -p$(pkg)-doc
- dh_installdocs -p$(pkg)-dev -p$(pkg)-common -p$(pkg)-doc
+override_dh_installchangelogs:
for pkgnews in $(pkg)-common $(pkg)-dev ; do \
cp -a debian/$$pkgnews.NEWS.Debian
debian/$$pkgnews/usr/share/doc/$$pkgnews/NEWS.Debian ; \
done
- dh_installexamples
- dh_installman
- dh_lintian
- dh_link
+ dh_installchangelogs
+
+override_dh_auto_clean:
+ cd doc; $(MAKE) clean
+ dh_auto_clean
+
+override_dh_compress :
dh_compress -X.pdf
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do by default.
+dist: get-orig-source
-dist:
+get-orig-source:
if [ ! -f debian/changelog ] ; then \
echo "File debian/changelog is missing. Something is wrong!" ; \
exit -1 ; \
@@ -76,7 +49,3 @@ dist:
rm -f `find . -name "*~"`
GZIP=-9 tar -czf ../$(pkg)_$(VERSION).tar.gz $(DISTDIR)
rm -rf $(DISTDIR)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
--
Git repository for blends code
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
