diffstat for gnupg2-2.2.12 gnupg2-2.2.12

 changelog |   12 ++++++++++++
 control   |   29 +++--------------------------
 rules     |   30 +++++++++++++++---------------
 3 files changed, 30 insertions(+), 41 deletions(-)

diff -Nru gnupg2-2.2.12/debian/changelog gnupg2-2.2.12/debian/changelog
--- gnupg2-2.2.12/debian/changelog	2018-12-15 01:17:16.000000000 +0000
+++ gnupg2-2.2.12/debian/changelog	2019-03-06 15:55:20.000000000 +0000
@@ -1,3 +1,15 @@
+gnupg2 (2.2.12-1co2) apertis; urgency=medium
+
+  * Make gpg replace+break gnupg (>= 1:1.4).
+
+ -- Andrej Shadura <andrew.shadura@collabora.co.uk>  Wed, 06 Mar 2019 16:55:20 +0100
+
+gnupg2 (2.2.12-1co1) apertis; urgency=medium
+
+  * Disable win32 build
+
+ -- Sjoerd Simons <sjoerd.simons@collabora.co.uk>  Sat, 26 Jan 2019 21:54:21 +0100
+
 gnupg2 (2.2.12-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru gnupg2-2.2.12/debian/control gnupg2-2.2.12/debian/control
--- gnupg2-2.2.12/debian/control	2018-11-18 22:38:25.000000000 +0000
+++ gnupg2-2.2.12/debian/control	2019-03-06 15:55:16.000000000 +0000
@@ -33,14 +33,7 @@
  transfig,
  zlib1g-dev | libz-dev,
 Build-Depends-Indep:
- binutils-multiarch [!amd64 !i386],
- libassuan-mingw-w64-dev (>= 2.5.0),
- libgcrypt-mingw-w64-dev (>= 1.7.0),
- libgpg-error-mingw-w64-dev (>= 1.26-2~),
- libksba-mingw-w64-dev (>= 1.3.4),
- libnpth-mingw-w64-dev (>= 1.2),
- libz-mingw-w64-dev,
- mingw-w64,
+ binutils-multiarch [!amd64 !i386]
 Vcs-Git: https://salsa.debian.org/debian/gnupg2.git
 Vcs-Browser: https://salsa.debian.org/debian/gnupg2
 Homepage: https://www.gnupg.org/
@@ -223,8 +216,10 @@
  ${shlibs:Recommends},
 Breaks:
  gnupg (<< 2.1.21-4),
+ gnupg (>= 1:1.4),
 Replaces:
  gnupg (<< 2.1.21-4),
+ gnupg (>= 1:1.4),
 Description: GNU Privacy Guard -- minimalist public key operations
  GnuPG is GNU's tool for secure communication and data storage.
  It can be used to encrypt data and to create digital signatures.
@@ -422,24 +417,6 @@
  installs on these platforms by using the full Debian signature
  verification that is present in all official Debian mirrors.
 
-Package: gpgv-win32
-Architecture: all
-Multi-Arch: foreign
-Depends:
- ${misc:Depends},
-Suggests:
- wine,
-Description: GNU privacy guard - signature verification tool (win32 build)
- GnuPG is GNU's tool for secure communication and data storage.
- .
- gpgv is a stripped-down version of gnupg which is only able to check
- signatures.  It is smaller than the full-blown gnupg and uses a
- different (and simpler) way to check that the public keys used to
- make the signature are trustworthy.
- .
- This is a win32 version of gpgv.  It's meant to be used by the win32-loader
- component of Debian-Installer.
-
 Package: gnupg-l10n
 Section: localization
 Architecture: all
diff -Nru gnupg2-2.2.12/debian/rules gnupg2-2.2.12/debian/rules
--- gnupg2-2.2.12/debian/rules	2018-11-18 22:37:53.000000000 +0000
+++ gnupg2-2.2.12/debian/rules	2019-01-26 20:53:45.000000000 +0000
@@ -59,21 +59,21 @@
 	cd build-gpgv-static/g10 && $(MAKE) LDFLAGS="$$LDFLAGS $(GPGV_STATIC_HARDENING) -static" gpgv
 	mv build-gpgv-static/g10/gpgv build-gpgv-static/g10/gpgv-static
 
-override_dh_auto_build-indep:
-	mkdir -p build-gpgv-win32
-	cd build-gpgv-win32 && $(WIN32_FLAGS) ../configure \
-	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x)) \
-		$(foreach x, libgpg-error libgcrypt libassuan ksba npth, --with-$x-prefix=/usr/i686-w64-mingw32) \
-		--enable-gpg2-is-gpg \
-		--with-zlib=/usr/i686-w64-mingw \
-		--prefix=/usr/i686-w64-mingw32 \
-		--host i686-w64-mingw32
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommon.a
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
-	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
-	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
-	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
-	strip build-gpgv-win32/g10/gpgv.exe
+#override_dh_auto_build-indep:
+#	mkdir -p build-gpgv-win32
+#	cd build-gpgv-win32 && $(WIN32_FLAGS) ../configure \
+#	   	$(foreach x, $(GPGV_UDEB_UNNEEDED), --disable-$(x)) \
+#		$(foreach x, libgpg-error libgcrypt libassuan ksba npth, --with-$x-prefix=/usr/i686-w64-mingw32) \
+#		--enable-gpg2-is-gpg \
+#		--with-zlib=/usr/i686-w64-mingw \
+#		--prefix=/usr/i686-w64-mingw32 \
+#		--host i686-w64-mingw32
+#	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommon.a
+#	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a
+#	cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a
+##	cd build-gpgv-win32/kbx && $(WIN32_FLAGS) $(MAKE) libkeybox.a
+##	cd build-gpgv-win32/g10 && $(WIN32_FLAGS) $(MAKE) gpgv.exe
+#	strip build-gpgv-win32/g10/gpgv.exe
 
 
 override_dh_auto_test: