X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=debian%2Frules;h=53a8a34023caf9d8707c38c8179c104638b68c3c;hp=f306f1df6ac1ea78dea8e9e86c43c110f291f03c;hb=bc89d962c87b50e5487628f8ca25e4443ac4823d;hpb=513328ac5f7c25f9ee144ab6befbea60d69eed1a

diff --git a/debian/rules b/debian/rules
index f306f1df..53a8a340 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,17 @@
 
 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 master
+	git push --tags origin master
 
 configure: configure-stamp
 configure-stamp:
@@ -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