[pkg-wpa-devel] r1543 - in /iw/trunk: ./ debian/changelog debian/patches/ debian/patches/dont-use-git-on-the-buildd.patch debian/patches/series

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

Author: slh-guest
Date: Tue Jul 20 14:57:59 2010
New Revision: 1543

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1543
Log:
don't use git on the buildd (Closes: #557167).

Added:
    iw/trunk/debian/patches/
    iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch
    iw/trunk/debian/patches/series
Modified:
    iw/trunk/   (props changed)
    iw/trunk/debian/changelog

Propchange: iw/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jul 20 14:57:59 2010
@@ -1,0 +1,1 @@
+.pc

Modified: iw/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/changelog?rev=1543&op=diff
==============================================================================
--- iw/trunk/debian/changelog (original)
+++ iw/trunk/debian/changelog Tue Jul 20 14:57:59 2010
@@ -7,8 +7,9 @@
     - use Breaks/ Replaces in favour of Conflicts with previous aircrack
       versions, policy 7.4.
   * update copyright years, clarify copyright status for nl80211.h.
+  * don't use git on the buildd (Closes: #557167).
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Tue, 20 Jul 2010 15:50:20 +0200
+ -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Tue, 20 Jul 2010 16:53:59 +0200
 
 iw (0.9.19-1) unstable; urgency=low
 

Added: iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch?rev=1543&op=file
==============================================================================
--- iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch (added)
+++ iw/trunk/debian/patches/dont-use-git-on-the-buildd.patch Tue Jul 20 14:57:59 2010
@@ -1,0 +1,57 @@
+iw: don't use git on the buildd
+
+Closes: #557167 (Debian BTS, http://bugs.debian.org/557167)
+On Fri, 20 Nov 2009 Christoph Biedl wrote:
+> during the build, upstream's Makefile calls the shipped version.sh,
+> one of the commands there is
+> 
+> | if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+> 
+> This is probably a remainder of a upstream's build concept which is
+> not included in Debian, as there is also no git repository here, and
+> git-core is not in the list of build dependencies.
+> 
+> If git is not installed, the error is caught and dealt in a sane way.
+> However, if git _is_ installed and there's a git repository (read:
+> .git directory) anywhere in a parent directory, that one is used.
+> Then either the check
+> | [ "${descr%%-*}" = "v$VERSION" ] || exit 2
+> will very likely fail, thus aborting the build process.  Or, as in my
+> case, that repository is owned by a different user, this caused an odd
+> error message
+> | fatal: unable to create '.git/index.lock': Permission denied
+> with the same outcome.
+> 
+> I suggest to drop that test entirely.
+
+Even though a build conflicts with git/ git-core would be easier by not
+requiring a patch to the upstream buildsystem, doing so would be painful
+for ongoing maintenance. Therefore remove the bogus for Debian test, as
+suggested by Christoph Biedl; unfortunately this patch is not upstreamable.
+
+Signed-off-by: Stefan Lippers-Hollmann <s.l-h at gmx.de>
+
+--- a/version.sh
++++ b/version.sh
+@@ -5,20 +5,6 @@ OUT="$1"
+ 
+ echo '#include "iw.h"' > "$OUT"
+ 
+-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+-	git update-index --refresh --unmerged > /dev/null
+-	descr=$(git describe)
+-
+-	# on git builds check that the version number above
+-	# is correct...
+-	[ "${descr%%-*}" = "v$VERSION" ] || exit 2
+-
+-	v="${descr#v}"
+-	if git diff-index --name-only HEAD | read dummy ; then
+-		v="$v"-dirty
+-	fi
+-else
+-	v="$VERSION"
+-fi
++v="$VERSION"
+ 
+ echo "const char iw_version[] = \"$v\";" >> "$OUT"

Added: iw/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/iw/trunk/debian/patches/series?rev=1543&op=file
==============================================================================
--- iw/trunk/debian/patches/series (added)
+++ iw/trunk/debian/patches/series Tue Jul 20 14:57:59 2010
@@ -1,0 +1,1 @@
+dont-use-git-on-the-buildd.patch