[Pkg-gnutls-commits] r1391 - in /packages/gnutls28/trunk/debian: changelog control rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Feb  4 13:39:09 2012
New Revision: 1391

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1391
Log:
De-multiarch guile-gnutls. Closes: #658110

Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/control
    packages/gnutls28/trunk/debian/rules

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1391&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Feb  4 13:39:09 2012
@@ -1,8 +1,8 @@
-gnutls28 (3.0.12-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sat, 21 Jan 2012 10:48:48 +0100
+gnutls28 (3.0.12-2) unstable; urgency=low
+
+  * De-multiarch guile-gnutls. Closes: #658110
+
+ -- Andreas Metzler <ametzler at debian.org>  Sat, 04 Feb 2012 14:34:48 +0100
 
 gnutls28 (3.0.12-1) unstable; urgency=low
 

Modified: packages/gnutls28/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/control?rev=1391&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/control (original)
+++ packages/gnutls28/trunk/debian/control Sat Feb  4 13:39:09 2012
@@ -137,7 +137,6 @@
 Architecture: any
 Section: lisp
 Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
-Multi-Arch: same
 Description: 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.

Modified: packages/gnutls28/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/rules?rev=1391&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/rules (original)
+++ packages/gnutls28/trunk/debian/rules Sat Feb  4 13:39:09 2012
@@ -61,6 +61,15 @@
 	dh_link -plibgnutlsxx28 usr/share/doc/libgnutls28 \
 		usr/share/doc/libgnutlsxx28
 
+# See #658110
+binary-install/guile-gnutls::
+	mv -v debian/guile-gnutls/usr/lib/*/guile debian/guile-gnutls/usr/lib \
+		&&\
+		rmdir -v --ignore-fail-on-non-empty \
+			debian/guile-gnutls/usr/lib/*-*
+	sed -i -e 's_usr/lib/[^/]*/guile/_usr/lib/guile/_' \
+		debian/guile-gnutls/usr/share/guile/site/gnutls.scm
+
 common-install-arch::
 	find debian/*/usr/lib/* -name '*.so.*.*' -type f -exec \
 		chrpath -d {} +