[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[pkg-wine-party] Bug#764110: wine: diff for NMU version 1.6.2-8.1



Control: tags 764110 + patch
Control: tags 764110 + pending

Dear maintainer,

I've prepared an NMU for wine (versioned as 1.6.2-8.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

cu Andreas
-- 
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
diff -Nru wine-1.6.2/debian/changelog wine-1.6.2/debian/changelog
--- wine-1.6.2/debian/changelog	2014-03-29 22:39:52.000000000 +0100
+++ wine-1.6.2/debian/changelog	2014-10-11 15:57:23.000000000 +0200
@@ -1,3 +1,12 @@
+wine (1.6.2-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build-depend on libgnutls28-dev instead of libgnutls-dev. Closes: #764110
+  * [find_debianspecific_gnutls_soname.diff] Adapt ./configure to accept the
+    Debian specific soname of GnuTLS v3.
+
+ -- Andreas Metzler <ametzler@debian.org>  Sat, 11 Oct 2014 14:37:30 +0200
+
 wine (1.6.2-8) unstable; urgency=medium
 
   * Use a .maintscript file to handle symlink-to-folder transitions in
diff -Nru wine-1.6.2/debian/control wine-1.6.2/debian/control
--- wine-1.6.2/debian/control	2014-03-29 22:40:28.000000000 +0100
+++ wine-1.6.2/debian/control	2014-10-11 15:58:18.000000000 +0200
@@ -41,7 +41,7 @@
  libxslt1-dev,
  unixodbc-dev,
  libcups2-dev,
- libgnutls-dev,
+ libgnutls28-dev,
  libopenal-dev,
  libmpg123-dev,
  libdbus-1-dev,
diff -Nru wine-1.6.2/debian/control.in wine-1.6.2/debian/control.in
--- wine-1.6.2/debian/control.in	2014-03-29 21:05:42.000000000 +0100
+++ wine-1.6.2/debian/control.in	2014-10-11 14:37:17.000000000 +0200
@@ -41,7 +41,7 @@
  libxslt1-dev,
  unixodbc-dev,
  libcups2-dev,
- libgnutls-dev,
+ libgnutls28-dev,
  libopenal-dev,
  libmpg123-dev,
  libdbus-1-dev,
diff -Nru wine-1.6.2/debian/patches/find_debianspecific_gnutls_soname.diff wine-1.6.2/debian/patches/find_debianspecific_gnutls_soname.diff
--- wine-1.6.2/debian/patches/find_debianspecific_gnutls_soname.diff	1970-01-01 01:00:00.000000000 +0100
+++ wine-1.6.2/debian/patches/find_debianspecific_gnutls_soname.diff	2014-10-11 15:56:13.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Adapt ./configure to the Debian specific GnuTLS soname.
+Author: Andreas Metzler <ametzler@debian.org>
+Origin: vendor
+Forwarded: not-needed
+
+--- wine-1.6.2.orig/configure.ac
++++ wine-1.6.2/configure.ac
+@@ -1348,7 +1348,7 @@ then
+     AC_CHECK_HEADER(gnutls/gnutls.h,
+         [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gnutls/gnutls.h>
+ #include <gnutls/crypto.h>]], [[static typeof(gnutls_mac_get_key_size) *func; if (func) return 0;]])],
+-            [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS])])],
++            [WINE_CHECK_SONAME(gnutls,gnutls_global_init,,[GNUTLS_CFLAGS=""],[$GNUTLS_LIBS],[libgnutls-deb0])])],
+         [GNUTLS_CFLAGS=""])
+     CPPFLAGS="$ac_save_CPPFLAGS"
+ fi
diff -Nru wine-1.6.2/debian/patches/series wine-1.6.2/debian/patches/series
--- wine-1.6.2/debian/patches/series	2014-03-29 18:16:09.000000000 +0100
+++ wine-1.6.2/debian/patches/series	2014-10-11 15:08:45.000000000 +0200
@@ -1,2 +1,3 @@
 manpages.patch
 printer-resolution.patch
+find_debianspecific_gnutls_soname.diff

Attachment: signature.asc
Description: Digital signature


Reply to: