[pkg-wpa-devel] r1866 - in /wpa/trunk/debian: changelog get-orig-source

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

Author: slh-guest
Date: Sat May 31 20:57:24 2014
New Revision: 1866

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1866
Log:
adapt get-orig-source for wpa 2.2~.

Modified:
    wpa/trunk/debian/changelog
    wpa/trunk/debian/get-orig-source

Modified: wpa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/changelog?rev=1866&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Sat May 31 20:57:24 2014
@@ -4,6 +4,7 @@
   * drop pre-wheezy /lib/init/rw/sendsigs.omit.d/ migration support, invert the
     according versioned initscripts dependency to a versioned breaks relation.
   * migrate from /var/run/ to /run/.
+  * adapt get-orig-source for wpa 2.2~.
 
  -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Fri, 21 Feb 2014 02:30:25 +0100
 

Modified: wpa/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/get-orig-source?rev=1866&op=diff
==============================================================================
--- wpa/trunk/debian/get-orig-source	(original)
+++ wpa/trunk/debian/get-orig-source	Sat May 31 20:57:24 2014
@@ -12,6 +12,7 @@
 VERSION="$(dpkg-parsechangelog -l${CURDIR}/debian/changelog | sed -ne 's,^Version: *\([0-9]*:\)\?\(.*\)$,\2,p')"
 DEB_VER="$(echo ${VERSION} | sed 's,\-[0-9a-z\~\.]*,,')"
 UP_VER="$(echo ${DEB_VER} | sed 's,\~,\-,g')"
+SNAPDATE="$(echo ${DEB_VER} | sed 's/.*\+git\([0-9]*\).*/\1/')"
 
 case "${UP_VER}" in
 *+git[0-9\.]*+*)
@@ -58,13 +59,20 @@
 	exit 4
 fi
 
-# create new usptream tarball
+# add Hotspot 2.0 OSU server for wpa 2.2~
+if dpkg --compare-versions "${DEB_VER}" ge "2.2~"; then
+	HS20="hs20"
+elif dpkg --compare-versions "${DEB_VER}" ge "2.1+" && [ "${SNAPDATE}" -ge "20140526" ]; then
+	HS20="hs20"
+fi
+
+# create new upstream tarball
 cd "${TEMP_SOURCE}" && \
 	git archive \
 		--format=tar \
 		--prefix="wpa-${UP_VER}/" \
 		"${UP_VER_TAG}" \
-			README COPYING patches src wpa_supplicant hostapd | \
+			README COPYING patches src wpa_supplicant hostapd $HS20 | \
 				xz -c6 > "${ORIG_TARBALL}"
 if [ "$?" -ne 0 ] || [ ! -e "${ORIG_TARBALL}" ]; then
 	echo "ERROR: failure to create ${ORIG_TARBALL}" >&2