diff --git a/debian/changelog b/debian/changelog index f73a460..5095202 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ - dropped cdbs + quilt from Build-Depends * debian/README.source: deleted because redundant * debian/rules: switch from cdbs to dh + * Hardening by droping Makefile patch in favour of providing + options directly inside debian/rules -- Andreas Tille Thu, 10 May 2012 11:11:57 +0200 diff --git a/debian/patches/01_Makefile.patch b/debian/patches/01_Makefile.patch deleted file mode 100644 index cade9ba..0000000 --- a/debian/patches/01_Makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Steffen Moeller -LastChanged: Thu, 16 Oct 2003 17:33:46 +0200 -Description: Provide main Makefile - ---- /dev/null -+++ b/Makefile -@@ -0,0 +1,7 @@ -+all: -+ cd src; make -+ -+clean: -+ cd src; make clean -+ rm -f bin/* lib/* obj/* -+ diff --git a/debian/patches/series b/debian/patches/series index f11e6c3..0851e90 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -01_Makefile.patch 10_gcc4.3.patch 10_gcc4.4.patch diff --git a/debian/rules b/debian/rules index 2671bb9..442bc1a 100755 --- a/debian/rules +++ b/debian/rules @@ -21,4 +21,5 @@ rm -f bin/* lib/* obj/* override_dh_auto_build: $(MANPAGES) - dh_auto_build + # dh_auto_build + cd src; make CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)"