Merge branch 'branch-1.1' into debian

[fw/altos] / debian / rules

diff --git a/debian/rules b/debian/rules
index 54a6d241932483ec6bf0819405dc0937963f9940..a4cbe2c112147f66a3078cc62f9c6dba11c207e6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,7 @@ PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
 
 # this target invoked by git-buildpackage using a clean hook, see .gbp.conf
 prebuild:
-       dch -v `git describe | tr - +` "build for Debian from git"
-       git commit debian/changelog -m "update Debian changelog for build"
+       echo "not frobbing changelog for official builds"
 
 configure: configure-stamp
 configure-stamp:
@@ -15,11 +14,14 @@ 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
        $(MAKE) VERSION=$(PKG_VERSION)
+       (cd doc ; $(MAKE))
        touch $@
 
 clean: 
@@ -36,12 +38,10 @@ install: build
        dh_installdirs
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/altos install
+       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
@@ -49,7 +49,11 @@ binary-arch: install
        dh_installdocs
        dh_installexamples
        dh_install
-#      dh_installmenu
+       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
 #      dh_installemacsen