diff -Nru libgpg-error-1.21/debian/changelog libgpg-error-1.21/debian/changelog
--- libgpg-error-1.21/debian/changelog	2016-02-16 06:11:28.000000000 +0000
+++ libgpg-error-1.21/debian/changelog	2016-02-18 11:35:58.000000000 +0000
@@ -1,3 +1,9 @@
+libgpg-error (1.21-2ubuntu1) xenial; urgency=medium
+
+  * Don't build the libgpg-error-mingw-w64-dev package (mingw64 is in universe).
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 18 Feb 2016 12:35:30 +0100
+
 libgpg-error (1.21-2) unstable; urgency=medium
 
   * build out-of-tree for cleanliness
diff -Nru libgpg-error-1.21/debian/control libgpg-error-1.21/debian/control
--- libgpg-error-1.21/debian/control	2016-02-16 06:09:57.000000000 +0000
+++ libgpg-error-1.21/debian/control	2016-02-18 11:35:27.000000000 +0000
@@ -9,7 +9,6 @@
                debhelper (>> 9),
                dh-autoreconf,
                gettext (>= 0.19.3)
-Build-Depends-Indep: mingw-w64
 Standards-Version: 3.9.6
 Homepage: http://www.gnupg.org/related_software/libgpg-error/
 Vcs-Git: git://anonscm.debian.org/pkg-gnupg/libgpg-error.git
@@ -50,18 +49,3 @@
  Library that defines common error values for all GnuPG
  components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
  pinentry, SmartCard Daemon and possibly more in the future.
-
-Package: libgpg-error-mingw-w64-dev
-Architecture: all
-Priority: extra
-Section: libdevel
-Depends: ${misc:Depends}
-Suggests: wine
-Description: library of error values and messages in GnuPG (Windows development)
- Library that defines common error values for all GnuPG
- components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
- pinentry, SmartCard Daemon and possibly more in the future.
- .
- This is a Windows version of libgpg-error.  It's meant to be used
- when cross-building software that targets the Windows platform,
- e.g. the win32-loader component of Debian-Installer.
diff -Nru libgpg-error-1.21/debian/rules libgpg-error-1.21/debian/rules
--- libgpg-error-1.21/debian/rules	2016-02-16 06:09:57.000000000 +0000
+++ libgpg-error-1.21/debian/rules	2016-02-18 11:36:49.000000000 +0000
@@ -41,26 +41,3 @@
 override_dh_link:
 	dh_link -plibgpg-error-dev lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so.0 usr/lib/$(DEB_HOST_MULTIARCH)/libgpg-error.so
 
-### "arch-independent" Windows builds: ###
-
-WIN_FLAGS=LDFLAGS="-Xlinker --no-insert-timestamp" CFLAGS="-g -Os" CPPFLAGS=
-
-override_dh_auto_build-indep:
-	for cpu in i686 x86_64; do \
-	 mkdir -p build-$$cpu-w64-mingw32 && \
-	 cd build-$$cpu-w64-mingw32 && $(WIN_FLAGS) ../configure \
-	    --prefix=/usr/$$cpu-w64-mingw32 \
-	    --enable-static \
-	    --host $$cpu-w64-mingw32 && \
-	  $(WIN_FLAGS) $(MAKE) \
-	  || exit 1 ; \
-	  cd .. ; \
-	done
-
-override_dh_auto_install-indep:
-	for cpu in i686 x86_64; do \
-	  cd build-$$cpu-w64-mingw32 && \
-	  $(MAKE) install DESTDIR=$(shell pwd)/debian/tmp \
-	  || exit 1 ; \
-	  cd .. ; \
-	done