X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=debian%2Frules;h=a7468b9f5c99814da86002ffd31fd184eb7df2e6;hp=fff5585fadf5be98a0e598971fd0a6717c77383b;hb=3cc1dad3b497524ffef61190dd68908cb19e8c35;hpb=c8c5b7963babe8eb16e2651fba9cd2c8d1cba74e

diff --git a/debian/rules b/debian/rules
index fff5585f..a7468b9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,17 @@
 
 export DH_VERBOSE=1
 PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
+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:
-	dch -v `git describe | tr - +` "build for Debian from git"
+	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
 
 configure: configure-stamp
 configure-stamp:
@@ -22,6 +26,7 @@ build: build-stamp
 build-stamp: configure-stamp  
 	dh_testdir
 	$(MAKE) VERSION=$(PKG_VERSION)
+	(cd doc ; $(MAKE))
 	touch $@
 
 clean: 
@@ -38,6 +43,8 @@ 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
@@ -52,8 +59,6 @@ binary-arch: install
 	dh_installexamples
 	dh_install
 	dh_installmenu
-	install debian/altusmetrum.xpm \
-		debian/altos/usr/share/pixmaps/altusmetrum.xpm
 #	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen