[med-svn] r15043 - trunk/packages/libace-perl/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-10-29 14:12:04 +0000 (Tue, 29 Oct 2013)
New Revision: 15043

Removed:
   trunk/packages/libace-perl/trunk/debian/patches/
Modified:
   trunk/packages/libace-perl/trunk/debian/changelog
   trunk/packages/libace-perl/trunk/debian/rules
Log:
Redo patches which are finally not helpfull but rather trust dh_auto_build to propagate hardening options


Modified: trunk/packages/libace-perl/trunk/debian/changelog
===================================================================
--- trunk/packages/libace-perl/trunk/debian/changelog	2013-10-29 13:06:34 UTC (rev 15042)
+++ trunk/packages/libace-perl/trunk/debian/changelog	2013-10-29 14:12:04 UTC (rev 15043)
@@ -8,7 +8,9 @@
      - canonical Vcs fields
   * debian/README.Debian: Remark about hard coding of build directory
     in probably unused file.
-  * debian/rules: use short dh
+  * debian/rules:
+     - use short dh
+     - enable propagation of hardening options
   * debian/upstream: Take over content of reference (DOI was wrongly
     specified at URL so I decided to remove)
   * debian/ace.1: automatically created manpage was broken - use help2man

Modified: trunk/packages/libace-perl/trunk/debian/rules
===================================================================
--- trunk/packages/libace-perl/trunk/debian/rules	2013-10-29 13:06:34 UTC (rev 15042)
+++ trunk/packages/libace-perl/trunk/debian/rules	2013-10-29 14:12:04 UTC (rev 15043)
@@ -26,8 +26,7 @@
 	# Directory does not exist.  Shall I create it for you? [y]
 	# Directory for the acebrowser HTML files and images (~username ok): [/usr/local/apache/htdocs/ace]
 	perl -e "print qq(3\ny\n$(CURDIR)/debian/$(PACKAGE)/etc/libace-perl\ny\n$(CURDIR)/debian/$(PACKAGE)/usr/lib/cgi-bin\ny\n$(CURDIR)/debian/$(PACKAGE)/usr/share/$(PACKAGE))" | $(PERL) Makefile.PL INSTALLDIRS=vendor
-	# $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
-	$(MAKE) CFLAGS="$(CFLAGS)" LD_RUN_PATH="" LDFLAGS=$(LDFLAGS)
+	dh_auto_build -- OPTIMIZE="$(CFLAGS)" LD_RUN_PATH="" OTHERLDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_test:
 	# Disabled as they need internet access.