actually deliver lintian overrides

[fw/altos] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2aa967e9ff8a1e37469c9fdba8e520f596d2e44f..87bebbb46cc8de29eaea5934e0eadb278a90000b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,20 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 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_flags = --disable-install-shared-mime-info --enable-faketime
 
 configure: configure-stamp
 configure-stamp:
-       dh_testdir
-       PKG_CONFIG_PATH=/opt/stlink/lib/pkgconfig ./autogen.sh \
-               --prefix=/usr \
-               --disable-install-shared-mime-info \
-               --with-google-key=/opt/google/maps-api-key
-       touch configure-stamp
+       autoreconf --force -v --install
+       dh_auto_configure -- $(configure_flags) && touch $@
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -49,7 +41,7 @@ install: build
        dh_installdirs
 
        $(MAKE) DESTDIR=$(CURDIR)/debian/altos install
-       sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/usr/lib/altos/ -name '*.la'`
+       sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/ -name '*.la'`
 
 binary-indep: install
 
@@ -65,23 +57,14 @@ 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
        cp icon/org-altusmetrum-mimetypes.xml debian/altos.sharedmimeinfo
        dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
        dh_installman
+       dh_lintian
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol