use multimaint-merge to make Debian changelogs less ugly

[fw/altos] / debian / rules

diff --git a/debian/rules b/debian/rules
index a7468b9f5c99814da86002ffd31fd184eb7df2e6..9f24321b6d1398f2b0e38bdfb213588795ec3cec 100755 (executable)
--- 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,14 +45,10 @@ 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
+       sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/usr/lib/altos/ -name '*.la'`
 
-# 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
@@ -58,6 +56,10 @@ binary-arch: install
        dh_installdocs
        dh_installexamples
        dh_install
+       ln -s /usr/share/altos/themes/background.png \
+               debian/altos/usr/share/gdm/themes/altusmetrum/background.png
+       ln -s /usr/share/altos/themes/background.png \
+               debian/altos/usr/share/slim/themes/altusmetrum/background.png
        dh_installmenu
 #      dh_installdebconf
 #      dh_installlogrotate