X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=debian%2Frules;h=9f24321b6d1398f2b0e38bdfb213588795ec3cec;hp=e0f1f72ca882fb5d64a0f50714737870d28dbe44;hb=c3314dae2d3df82e188daf6ba8520cce833592c6;hpb=ea7130e953622884afc348265f5a4c58f9876823

diff --git a/debian/rules b/debian/rules
index e0f1f72c..9f24321b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,12 +8,12 @@ DEB_VERSION := $(shell if [ -x /usr/bin/git ]; then git describe; else echo 0; f
 # 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-dch --release --new-version=$(DEB_VERSION) --multimaint-merge
 	git log > ChangeLog
 	git commit -n ChangeLog debian/changelog \
 		-m "update changelogs for Debian build"
-	git tag debian/$(DEB_VERSION)
-	git push --tags origin master
+#	git tag debian/$(DEB_VERSION)
+#	git push --tags origin master
 
 configure: configure-stamp
 configure-stamp:
@@ -21,7 +21,9 @@ configure-stamp:
 	./autogen.sh --prefix=/usr
 	touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp: configure-stamp  
 	dh_testdir
@@ -43,6 +45,7 @@ install: build
 	dh_installdirs
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/altos install
+	sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/usr/lib/altos/ -name '*.la'`
 
 binary-indep: install
 
@@ -54,9 +57,9 @@ binary-arch: install
 	dh_installexamples
 	dh_install
 	ln -s /usr/share/altos/themes/background.png \
-		/usr/share/gdm/themes/altusmetrum/background.png
+		debian/altos/usr/share/gdm/themes/altusmetrum/background.png
 	ln -s /usr/share/altos/themes/background.png \
-		/usr/share/slim/themes/altusmetrum/background.png
+		debian/altos/usr/share/slim/themes/altusmetrum/background.png
 	dh_installmenu
 #	dh_installdebconf
 #	dh_installlogrotate