no longer need patch

[fw/altos] / debian / rules

diff --git a/debian/rules b/debian/rules
index a4cbe2c112147f66a3078cc62f9c6dba11c207e6..2a991377c4e634a2d0bf3600ba6d62017a98a3c0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/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')
 
@@ -8,11 +9,16 @@ PKG_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
 prebuild:
        echo "not frobbing changelog for official builds"
 
+configure_flags = \
+       --with-java-version=8 \
+       --disable-install-shared-mime-info \
+       --enable-faketime \
+       --disable-multi-arch
+
 configure: configure-stamp
 configure-stamp:
-       dh_testdir
-       ./autogen.sh --prefix=/usr
-       touch configure-stamp
+       autoreconf --force -v --install
+       dh_auto_configure -- $(configure_flags) && touch $@
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -20,7 +26,7 @@ build-indep: build-stamp
 
 build-stamp: configure-stamp  
        dh_testdir
-       $(MAKE) VERSION=$(PKG_VERSION)
+       $(MAKE)
        (cd doc ; $(MAKE))
        touch $@
 
@@ -28,6 +34,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp configure-stamp
+       rm -f debian/altos.sharedmimeinfo
        [ ! -f Makefile ] || $(MAKE) distclean
        dh_clean 
 
@@ -38,7 +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'`
+       sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/ -name '*.la'`
 
 binary-indep: install
 
@@ -54,22 +61,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
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
+       cp icon/org-altusmetrum-mimetypes.xml debian/altos.sharedmimeinfo
+       dh_installmime
        dh_installman
+       dh_lintian
        dh_link
        dh_strip
        dh_compress
        dh_fixperms
-#      dh_perl
-#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol