Bug#630511: Bug#634116: Please transition gnutls26 for multiarch

2011-08-12 Thread Julien Cristau 
On Sat, Jul 30, 2011 at 07:20:17 +0200, Andreas Metzler wrote:

 On 2011-07-17 Andreas Metzler ametz...@downhill.at.eu.org wrote:
  On 2011-07-17 Steve Langasek steve.langa...@canonical.com wrote:
   On Sun, Jul 17, 2011 at 08:15:43AM +0200, Andreas Metzler wrote:
 
gnutls 2.12 in experimental is already using multiarch paths:
---
gnutls26 (2.12.7-2) experimental; urgency=low
  [...]
   Ok.  When do you plan to upload 2.12.7 to unstable?
 
  I am basically waiting for feedback/ok from the release team.
  http://bugs.debian.org/630511
 
 FYI I will probably upload to unstable without further notice once
 2.10.5-3 has transitioned to testing.
 cu andreas
 
That's unhelpful...

Cheers,
Julien



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#630511: Bug#634116: Please transition gnutls26 for multiarch

2011-07-29 Thread Andreas Metzler 
On 2011-07-17 Andreas Metzler ametz...@downhill.at.eu.org wrote:
 On 2011-07-17 Steve Langasek steve.langa...@canonical.com wrote:
  On Sun, Jul 17, 2011 at 08:15:43AM +0200, Andreas Metzler wrote:

   gnutls 2.12 in experimental is already using multiarch paths:
   ---
   gnutls26 (2.12.7-2) experimental; urgency=low
 [...]
  Ok.  When do you plan to upload 2.12.7 to unstable?

 I am basically waiting for feedback/ok from the release team.
 http://bugs.debian.org/630511

FYI I will probably upload to unstable without further notice once
2.10.5-3 has transitioned to testing.
cu andreas



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#634116: Please transition gnutls26 for multiarch

2011-07-17 Thread Steve Langasek 
On Sun, Jul 17, 2011 at 08:15:43AM +0200, Andreas Metzler wrote:

 gnutls 2.12 in experimental is already using multiarch paths:
 ---
 gnutls26 (2.12.7-2) experimental; urgency=low
 
   * Stop shipping libtool la files.
   * Convert to multi-arch. (Partial merge from Ubuntu 2.10.5-1ubuntu2):
 + configure with --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH), update
   *.install accordingly.
 + Bump cdbs Build-Depends to 0.4.93 (required for expanding
   $(DEB_HOST_MULTIARCH)).
 + Bump debhelper b-d to 8.1.3 (for ${misc:Pre-Depends}).
 + runtime libraries and guile-wrapper are Multi-Arch: same with
   Pre-Depends: ${misc:Pre-Depends}, -bin (helper binaries) and -doc are
   Multi-Arch: foreign, -dev and -dbg remain unchanged.
 + Diverge from Ubuntu patch  by not settting Multi-Arch: same on -dbg
   package. It contains debugging symbols for both library and helper
   binaries ( e.g. /usr/lib/debug/usr/bin/gnutls-cli) and is therefore not
   co-installable with itself.

Ok.  When do you plan to upload 2.12.7 to unstable?

Thanks,
-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org


signature.asc
Description: Digital signature

Bug#630511: Bug#634116: Please transition gnutls26 for multiarch

2011-07-17 Thread Andreas Metzler 
On 2011-07-17 Steve Langasek steve.langa...@canonical.com wrote:
 On Sun, Jul 17, 2011 at 08:15:43AM +0200, Andreas Metzler wrote:

  gnutls 2.12 in experimental is already using multiarch paths:
  ---
  gnutls26 (2.12.7-2) experimental; urgency=low
[...]
 Ok.  When do you plan to upload 2.12.7 to unstable?

I am basically waiting for feedback/ok from the release team.
http://bugs.debian.org/630511

cu andreas



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org

Bug#634116: Please transition gnutls26 for multiarch

2011-07-16 Thread Steve Langasek 
Source: gnutls26
Version: 2.10.5-2
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: ubuntu-patch oneiric origin-ubuntu

Hi folks,

Please find attached a patch to gnutls26 to transition it to use of the
multiarch library paths as described at
http://wiki.debian.org/Multiarch/Implementation.  This patch has been
applied and is being used successfully in Ubuntu 11.04, and should be safe
to apply in Debian now that multiarch has been bootstrapped there.

Thanks,
-- 
Steve Langasek   Give me a lever long enough and a Free OS
Debian Developer   to set it on, and I can move the world.
Ubuntu Developerhttp://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/changelog'
--- debian/changelog	2011-06-25 18:13:38 +
+++ debian/changelog	2011-07-17 01:59:19 +
@@ -1,3 +1,10 @@
+gnutls26 (2.10.5-2.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Build for multiarch.
+
+ -- Steve Langasek steve.langa...@ubuntu.com  Sat, 16 Jul 2011 18:57:27 -0700
+
 gnutls26 (2.10.5-2) unstable; urgency=low
 
   * Stop shipping libtool la files.

=== modified file 'debian/control'
--- debian/control	2011-02-06 16:44:09 +
+++ debian/control	2011-07-17 02:08:41 +
@@ -6,8 +6,8 @@
  Eric Dorland e...@debian.org,
  James Westby jw+deb...@jameswestby.net,
  Simon Josefsson si...@josefsson.org
-Build-Depends: debhelper (= 7.0.14), libgcrypt11-dev (= 1.3.2), zlib1g-dev,
- cdbs (= 0.4.53), gtk-doc-tools, texinfo (= 4.8),
+Build-Depends: debhelper (= 8.1.3), libgcrypt11-dev (= 1.3.2), zlib1g-dev,
+ cdbs (= 0.4.93), gtk-doc-tools, texinfo (= 4.8),
  libtasn1-3-dev (= 0.3.4-0), autotools-dev, guile-1.8-dev, datefudge
 Build-Conflicts: libgnutls-dev
 Standards-Version: 3.9.1
@@ -52,6 +52,8 @@
 # Bug 587755. - This could be removed after a libgnutls soname bump.
 Breaks: libsoup2.4-1 (= 2.30.1-1), libsoup2.4-1 (= 2.31.2-1)
 Suggests: gnutls-bin
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: the GNU TLS library - runtime library
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
@@ -76,6 +78,7 @@
 Section: debug
 Depends: libgnutls26 (= ${binary:Version}), ${misc:Depends}
 Conflicts: libgnutls13-dbg
+Multi-Arch: same
 Description: GNU TLS library - debugger symbols
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
@@ -89,6 +92,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libgnutls5-dev, gnutls0.4-dev, gnutls-dev ( 0.4.0-0)
 Replaces: libgnutls5-dev, gnutls0.4-dev, gnutls-dev ( 0.4.0-0)
+Multi-Arch: foreign
 Description: the GNU TLS library - commandline utilities
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
@@ -114,6 +118,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: the GNU TLS library - documentation and examples
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
@@ -137,6 +142,8 @@
 Architecture: any
 Section: lisp
 Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: the GNU TLS library - GNU Guile bindings
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
@@ -160,6 +167,8 @@
 Architecture: any
 Section: libs
 Depends: libgnutls26 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: the GNU TLS library - C++ runtime library
  GnuTLS is a portable library which implements the Transport Layer
  Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.

=== modified file 'debian/guile-gnutls.install'
--- debian/guile-gnutls.install	2010-03-20 15:53:35 +
+++ debian/guile-gnutls.install	2011-07-17 01:56:47 +
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libguile-gnutls*.so* usr/lib
-debian/tmp/usr/share/guile/site usr/share/guile
+debian/tmp/usr/lib/*/libguile-gnutls*.so*
+debian/tmp/usr/share/guile/site

=== modified file 'debian/libgnutls-dev.install'
--- debian/libgnutls-dev.install	2011-06-25 18:13:38 +
+++ debian/libgnutls-dev.install	2011-07-17 01:57:07 +
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/libgnutls*.so usr/lib
-debian/tmp/usr/lib/libgnutls*.a usr/lib
-debian/tmp/usr/lib/pkgconfig/gnutls.pc usr/lib/pkgconfig
-debian/tmp/usr/lib/pkgconfig/gnutls-extra.pc usr/lib/pkgconfig
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*/libgnutls*.so
+debian/tmp/usr/lib/*/libgnutls*.a
+debian/tmp/usr/lib/*/pkgconfig/gnutls.pc