[Pkg-gnupg-commit] r217 - in /gnupg/trunk/debian: changelog control rules

[thijs at users.alioth.debian.org]

Author: thijs
Date: Mon Feb 20 21:11:21 2012
New Revision: 217

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=217
Log:
backout mingw-64 for now; not installable here

Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/control
    gnupg/trunk/debian/rules

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=217&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Mon Feb 20 21:11:21 2012
@@ -8,7 +8,6 @@
     take the chance to switch to dpkg-source 3.0 (quilt) format.
   * Several packaging tweaks to keep Lintian happy.
   * Mark packages Multi-Arch: foreign. thanks Colin Watson (closes: #649490).
-  * Build win32 package with mingw-w64, thanks Stephen Kitt (closes: #623526).
   * Fix path to README.BUGS.Debian.gz in presubj (closes: #614962).
   * Add Crypto Stick to udev rules (closes: #648332).
 

Modified: gnupg/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/control?rev=217&op=diff
==============================================================================
--- gnupg/trunk/debian/control (original)
+++ gnupg/trunk/debian/control Mon Feb 20 21:11:21 2012
@@ -10,7 +10,7 @@
  libusb-dev [!hurd-i386],
  libreadline-dev, file, gettext, 
  libcurl4-gnutls-dev
-Build-Depends-Indep: mingw-w64
+Build-Depends-Indep: mingw32
 Homepage: http://www.gnupg.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnupg/gnupg/trunk/

Modified: gnupg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/rules?rev=217&op=diff
==============================================================================
--- gnupg/trunk/debian/rules (original)
+++ gnupg/trunk/debian/rules Mon Feb 20 21:11:21 2012
@@ -53,8 +53,8 @@
 build-win32/config.status:
 	dh_testdir
 	(mkdir -p $(@D); cd $(@D); CFLAGS="-g -Os" \
-	    ../configure $(CONFARGS) --host i686-w64-mingw32 \
-	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl --disable-ldap)
+	    ../configure $(CONFARGS) --host i586-mingw32msvc \
+	    --disable-gnupg-iconv --without-bzip2 --without-readline --without-libcurl)
 
 ##################################### build ##################################