Reenabled binary stripping.

[ion3.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index d9c6418426927930b67197327d24d11dcc2eef57..f14715aa1d7fb05273fc3e18a1754e8fb18e6f9b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 
 export SHELL=/bin/bash
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 PACKAGE := ion3
 PACKAGE_DEV := $(PACKAGE)-dev
@@ -13,7 +13,8 @@ PACKAGE_DOC := $(PACKAGE)-doc
 INSTDIR := debian/$(PACKAGE)
 INSTDIR_DEV := debian/$(PACKAGE_DEV)
 INSTDIR_DOC := debian/$(PACKAGE_DOC)
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -r 's/^Version: ([0-9]*:)?(.*)-[^-]*$$/\2/; t; d')
+DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -r 's/^Version: //; t; d')
+UPSTREAM_VERSION := $(shell echo $(DEBIAN_VERSION) | sed -r 's/^[0-9]*://; s/-[^-]*$$//')
 
 doc-orig:
        cp -R doc doc-orig
@@ -109,7 +110,7 @@ binary-indep: build-indep install-indep
 #      dh_installinfo -i
 #      dh_undocumented -i
 #      dh_installman -i
-#      dh_link -i
+       dh_link -i
 #      dh_strip -i
        dh_compress -i
        dh_fixperms -i
@@ -140,8 +141,6 @@ binary-arch: build-arch install-arch
        install -m644 debian/ion3.menu-method.i18n \
                $(INSTDIR)/etc/menu-methods/ion3-i18n
 
-       cat $(CURDIR)/debian/patches/extra/debian-menu.cfg >> $(INSTDIR)/etc/X11/ion3/cfg_ioncore.lua
-
        dh_installdebconf -a
 #      dh_installlogrotate -a
 #      dh_installemacsen -a
@@ -153,14 +152,14 @@ binary-arch: build-arch install-arch
 #      dh_undocumented -a
 #      dh_installman -a
        dh_link -a
-#      dh_strip -a
+       dh_strip -a
        dh_compress -a -X.lua
        dh_fixperms -a
 #      dh_perl -a
 #      dh_python -a
 #      dh_makeshlibs -a
        dh_installdeb -a
-       sed -i 's/^UPSTREAM_VERSION=/UPSTREAM_VERSION=$(UPSTREAM_VERSION)/' \
+       sed -i 's/^DEBIAN_VERSION=/&$(DEBIAN_VERSION)/; s/^UPSTREAM_VERSION=/&$(UPSTREAM_VERSION)/' \
                debian/ion3/DEBIAN/postinst
        dh_shlibdeps -a
        dh_gencontrol -a
@@ -168,5 +167,10 @@ binary-arch: build-arch install-arch
        dh_builddeb -a
 
 binary: binary-indep binary-arch
+
+get-orig-source:
+       chmod +x debian/get-orig-source
+       debian/get-orig-source
+
 .PHONY: build-indep build-arch build clean binary-indep binary-arch binary \
-       install-indep install-arch unpatch
+       install-indep install-arch unpatch get-orig-source