patches merged upstream in 1.8.7 release

[fw/altos] / debian / rules

diff --git a/debian/rules b/debian/rules
index 122a0fed2349bfcc7cbe9895e8fe9b095c730888..553d595de0461b5fb99c1d1516468d195d498e7e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,22 +3,18 @@
 
 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:
-       echo $(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
+       echo "not frobbing changelog for official builds"
 
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-       ./autogen.sh --prefix=/usr
+       ./autogen.sh \
+               --prefix=/usr \
+               --disable-install-shared-mime-info \
+               --enable-faketime
        touch configure-stamp
 
 build: build-arch build-indep
@@ -35,6 +31,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
+       rm -f debian/altos.sharedmimeinfo
        [ ! -f Makefile ] || $(MAKE) distclean
        dh_clean 
 
@@ -61,22 +58,13 @@ binary-arch: install
        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
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
+       cp icon/org-altusmetrum-mimetypes.xml debian/altos.sharedmimeinfo
+       dh_installmime
        dh_installman
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol