[Pkg-gnutls-commits] r1083 - in /packages/libtasn1-3/trunk/debian: changelog control libtasn1-3-dev.install libtasn1-3.install rules

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Jun 18 06:31:14 2011
New Revision: 1083

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1083
Log:
build for multiarch

Modified:
    packages/libtasn1-3/trunk/debian/changelog
    packages/libtasn1-3/trunk/debian/control
    packages/libtasn1-3/trunk/debian/libtasn1-3-dev.install
    packages/libtasn1-3/trunk/debian/libtasn1-3.install
    packages/libtasn1-3/trunk/debian/rules

Modified: packages/libtasn1-3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libtasn1-3/trunk/debian/changelog?rev=1083&op=diff
==============================================================================
--- packages/libtasn1-3/trunk/debian/changelog (original)
+++ packages/libtasn1-3/trunk/debian/changelog Sat Jun 18 06:31:14 2011
@@ -1,6 +1,15 @@
 libtasn1-3 (2.9-4) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * Merge from Ubuntu (build for multiarch):
+    + 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 library is Multi-Arch: same and has Pre-Depends: 
+      ${misc:Pre-Depends}, -dbg is Multi-Arch: same, -bin (helper binaries)
+      is Multi-Arch: foreign. -dev is unchanged.
 
  -- Andreas Metzler <ametzler at debian.org>  Sun, 24 Apr 2011 10:12:25 +0200
 

Modified: packages/libtasn1-3/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libtasn1-3/trunk/debian/control?rev=1083&op=diff
==============================================================================
--- packages/libtasn1-3/trunk/debian/control (original)
+++ packages/libtasn1-3/trunk/debian/control Sat Jun 18 06:31:14 2011
@@ -2,7 +2,7 @@
 Section: libs
 Maintainer: Debian GnuTLS Maintainers <pkg-gnutls-maint at lists.alioth.debian.org>
 Uploaders: Andreas Metzler <ametzler at debian.org>, Eric Dorland <eric at debian.org>, James Westby <jw+debian at jameswestby.net>, Simon Josefsson <simon at josefsson.org>
-Build-Depends: debhelper (>> 7.0.14), cdbs (>= 0.4.53), bison, gtk-doc-tools,
+Build-Depends: debhelper (>> 8.1.3), cdbs (>= 0.4.93), bison, gtk-doc-tools,
  texinfo, autotools-dev, texlive-latex-base
 Standards-Version: 3.9.1
 Priority: standard
@@ -34,6 +34,7 @@
 Architecture: any
 Depends: libtasn1-3 (= ${binary:Version}), ${misc:Depends}
 Priority: extra
+Multi-Arch: same
 Description: Manage ASN.1 structures (debugging symbols)
  Manage ASN1 (Abstract Syntax Notation One) structures.
  The main features of this library are:
@@ -51,6 +52,8 @@
 Priority: standard
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Manage ASN.1 structures (runtime)
  Manage ASN1 (Abstract Syntax Notation One) structures.
  The main features of this library are:
@@ -68,6 +71,7 @@
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
 Description: Manage ASN.1 structures (binaries)
  Manage ASN1 (Abstract Syntax Notation One) structures.
  The main features of this library are:

Modified: packages/libtasn1-3/trunk/debian/libtasn1-3-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libtasn1-3/trunk/debian/libtasn1-3-dev.install?rev=1083&op=diff
==============================================================================
--- packages/libtasn1-3/trunk/debian/libtasn1-3-dev.install (original)
+++ packages/libtasn1-3/trunk/debian/libtasn1-3-dev.install Sat Jun 18 06:31:14 2011
@@ -1,7 +1,7 @@
 ../../doc/libtasn1.pdf usr/share/doc/libtasn1-3-dev
 ../../doc/fdl-1.3.texi usr/share/doc/libtasn1-3-dev
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*.pc
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*.pc
 usr/share/man/man3/*

Modified: packages/libtasn1-3/trunk/debian/libtasn1-3.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libtasn1-3/trunk/debian/libtasn1-3.install?rev=1083&op=diff
==============================================================================
--- packages/libtasn1-3/trunk/debian/libtasn1-3.install (original)
+++ packages/libtasn1-3/trunk/debian/libtasn1-3.install Sat Jun 18 06:31:14 2011
@@ -1,1 +1,1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*

Modified: packages/libtasn1-3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libtasn1-3/trunk/debian/rules?rev=1083&op=diff
==============================================================================
--- packages/libtasn1-3/trunk/debian/rules (original)
+++ packages/libtasn1-3/trunk/debian/rules Sat Jun 18 06:31:14 2011
@@ -4,7 +4,10 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --with-packager=Debian --with-packager-bug-reports=http://bugs.debian.org.org/ --with-packager-version="$(DEB_VERSION)"
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --with-packager=Debian \
+	--with-packager-bug-reports=http://bugs.debian.org.org/ \
+	--with-packager-version="$(DEB_VERSION)" \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 DEB_MAKE_CHECK_TARGET = check