[pkg-wpa-devel] r1798 - in /wpa/trunk/debian: changelog get-orig-source rules source/options

[slh-guest at users.alioth.debian.org]

Author: slh-guest
Date: Wed Jan 16 21:24:53 2013
New Revision: 1798

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1798
Log:
* debian/get-orig-source: switch to xz compressed upstream tarballs.
* compress binaries with xz.
* fix hardening flags.

Added:
    wpa/trunk/debian/source/options
Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/get-orig-source
    wpa/trunk/debian/rules

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1798&op=diff
==============================================================================
--- wpa/trunk/debian/changelog (original)
+++ wpa/trunk/debian/changelog Wed Jan 16 21:24:53 2013
@@ -9,6 +9,9 @@
     <patrik.flykt at linux.intel.com> (Closes: #690536).
   * use the readline6, wpa_cli doesn't link to openssl.
   * link with --as-needed.
+  * debian/get-orig-source: switch to xz compressed upstream tarballs.
+  * compress binaries with xz.
+  * fix hardening flags.
 
  -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Wed, 16 Jan 2013 18:48:22 +0100
 

Modified: wpa/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/get-orig-source?rev=1798&op=diff
==============================================================================
--- wpa/trunk/debian/get-orig-source (original)
+++ wpa/trunk/debian/get-orig-source Wed Jan 16 21:24:53 2013
@@ -15,9 +15,9 @@
 
 # write to ../tarballs/, if it exists - ../ otherwise
 if [ -d "${CURDIR}/../tarballs" ]; then
-	ORIG_TARBALL="${CURDIR}/../tarballs/wpa_${DEB_VER}.orig.tar.gz"
+	ORIG_TARBALL="${CURDIR}/../tarballs/wpa_${DEB_VER}.orig.tar.xz"
 else
-	ORIG_TARBALL="${CURDIR}/../wpa_${DEB_VER}.orig.tar.gz"
+	ORIG_TARBALL="${CURDIR}/../wpa_${DEB_VER}.orig.tar.xz"
 fi
 
 # don't overwrite existing tarballs
@@ -47,7 +47,7 @@
 		--prefix="wpa-${UP_VER}/" \
 		"${UP_VER_TAG}" \
 			README COPYING patches src wpa_supplicant hostapd | \
-				gzip -c9 > "${ORIG_TARBALL}"
+				xz -c6 > "${ORIG_TARBALL}"
 if [ "$?" -ne 0 ] || [ ! -e "${ORIG_TARBALL}" ]; then
 	echo "ERROR: failure to create ${ORIG_TARBALL}" >&2
 	rm -rf "${TEMP_SOURCE}"

Modified: wpa/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/rules?rev=1798&op=diff
==============================================================================
--- wpa/trunk/debian/rules (original)
+++ wpa/trunk/debian/rules Wed Jan 16 21:24:53 2013
@@ -2,12 +2,12 @@
 
 # The build system doesn't use CPPFLAGS, pass them to CFLAGS/CXXFLAGS to
 # enable the missing (hardening) flags
-CFLAGS   += -MMD -Wall $(CPPFLAGS)
-CXXFLAGS += $(CPPFLAGS)
+DEB_CFLAGS_MAINT_APPEND   = -MMD -Wall $(shell dpkg-buildflags --get CPPFLAGS)
+DEB_CXXFLAGS_MAINT_APPEND = $(shell dpkg-buildflags --get CPPFLAGS)
+DEB_LDFLAGS_MAINT_APPEND  = -Wl,--as-needed
+export DEB_CFLAGS_MAINT_APPEND DEB_CXXFLAGS_MAINT_APPEND DEB_LDFLAGS_MAINT_APPEND
 
 UCFLAGS  = -MMD -Wall -g -Os
-
-LDFLAGS += -Wl,--as-needed
 
 BINDIR   = /sbin
 V = 1
@@ -18,7 +18,7 @@
 	CC=$(DEB_HOST_GNU_TYPE)-gcc
 endif
 
-export CC BINDIR LDFLAGS V
+export CC BINDIR V
 
 DEB_HOST_ARCH_OS              ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 HOSTAPD_DOT_CONFIG            := debian/config/hostapd/$(DEB_HOST_ARCH_OS)
@@ -119,6 +119,9 @@
 override_dh_gencontrol:
 	dh_gencontrol -phostapd -- '-v1:$(VERSION)'
 	dh_gencontrol --remaining-packages
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz -z6
 ### end dh overrides
 
 %:

Added: wpa/trunk/debian/source/options
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/source/options?rev=1798&op=file
==============================================================================
--- wpa/trunk/debian/source/options (added)
+++ wpa/trunk/debian/source/options Wed Jan 16 21:24:53 2013
@@ -1,0 +1,2 @@
+compression = "xz"
+compression-level = 9