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

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

Author: slh-guest
Date: Mon Nov 25 21:27:48 2013
New Revision: 1817

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1817
Log:
debian/get-orig-source: adapt for the post 1.x upstream branch.

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=1817&op=diff
==============================================================================
--- wpa/trunk/debian/changelog	(original)
+++ wpa/trunk/debian/changelog	Mon Nov 25 21:27:48 2013
@@ -11,6 +11,7 @@
   * use the readline6, wpa_cli doesn't link to openssl.
   * link with --as-needed.
   * debian/get-orig-source: switch to xz compressed upstream tarballs.
+  * debian/get-orig-source: adapt for the post 1.x upstream branch.
   * compress binaries with xz.
   * fix hardening flags.
   * debian/control: fold dependencies.

Modified: wpa/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/pkg-wpa/wpa/trunk/debian/get-orig-source?rev=1817&op=diff
==============================================================================
--- wpa/trunk/debian/get-orig-source	(original)
+++ wpa/trunk/debian/get-orig-source	Mon Nov 25 21:27:48 2013
@@ -13,9 +13,17 @@
 UP_VER="$(echo ${DEB_VER} | sed 's,\~,\-,g')"
 UP_VER_TAG="hostap_$(echo $UP_VER | sed -e 's,\.,_,g' -e 's,\-,_,g')"
 
-# write to ../tarballs/, if it exists - ../ otherwise
+# set upstream (git-) Vcs
+UP_VCS="git://w1.fi/srv/git/hostap.git"
+if dpkg --compare-versions "${DEB_VER}" lt "2~"; then
+	UP_VCS="git://w1.fi/srv/git/hostap-1.git"
+fi
+
+# write to ../{,_}tarballs/, if it exists - ../ otherwise
 if [ -d "${CURDIR}/../tarballs" ]; then
 	ORIG_TARBALL="${CURDIR}/../tarballs/wpa_${DEB_VER}.orig.tar.xz"
+elif [ -d "${CURDIR}/../_tarballs" ]; then
+	ORIG_TARBALL="${CURDIR}/../_tarballs/wpa_${DEB_VER}.orig.tar.xz"
 else
 	ORIG_TARBALL="${CURDIR}/../wpa_${DEB_VER}.orig.tar.xz"
 fi
@@ -33,9 +41,10 @@
 fi
 
 # clone upstream git repository
-git clone git://w1.fi/srv/git/hostap-1.git "${TEMP_SOURCE}"
+echo "clone ${UP_VCS}:"
+git clone "${UP_VCS}" "${TEMP_SOURCE}"
 if [ "$?" -ne 0 ] || [ ! -d "${TEMP_SOURCE}" ]; then
-	echo "ERROR: cloning git://w1.fi/srv/git/hostap-1.git failed" >&2
+	echo "ERROR: cloning ${UP_VCS} failed" >&2
 	rm -rf "${TEMP_SOURCE}"
 	exit 4
 fi