merge the altusmetrum-themes package

[fw/altos] / debian / rules

diff --git a/debian/rules b/debian/rules
index ac594c076242236ce4c40b79a5d9625bd4ac13b0..53a8a34023caf9d8707c38c8179c104638b68c3c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,14 @@
 
 export DH_VERBOSE=1
 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
-DEB_VERSION := $(shell git describe | tr - +)
+DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; fi | tr - +)
 
 # this target invoked by git-buildpackage using a clean hook, see .gbp.conf
 prebuild:
+       echo $(DEB_VERSION)
        git-dch --release --new-version=$(DEB_VERSION)
        git log > ChangeLog
-       git commit ChangeLog debian/changelog \
+       git commit -n ChangeLog debian/changelog \
                -m "update changelogs for Debian build"
        git tag debian/$(DEB_VERSION)
        git push --tags origin master
@@ -25,6 +26,7 @@ build: build-stamp
 build-stamp: configure-stamp  
        dh_testdir
        $(MAKE) VERSION=$(PKG_VERSION)
+       (cd doc ; $(MAKE))
        touch $@
 
 clean: 
@@ -41,14 +43,9 @@ install: build
        dh_installdirs
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/altos install
-       install -o root -g root -m 0644 debian/altusmetrum.xpm \
-               $(CURDIR)/debian/altos/usr/share/pixmaps/altusmetrum.xpm
 
-# Build architecture-independent files here.
 binary-indep: install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: install
        dh_testdir
        dh_testroot