Multiarchify

diff --git a/debian/changelog b/debian/changelog
index 40be3658ffad0e951f6d07e43eb27625ab3493a0..b71c6e695be8eb1b63f5a94e58dc64ce7dfdfd77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ yubikey-personalization (1.6.1-1) unstable; urgency=low
   * New upstream release, hopefully fixing FTBFS-es.  Closes: #636190
   * Drop docs no longer present in upstream tarball.
   * Update symbols file for new symbols upstream.
+  * Multiarchify, bumping debhelper compat level and adjusting paths in
+    install files.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Fri, 26 Aug 2011 08:13:24 +0200
 

diff --git a/debian/compat b/debian/compat
index 7f8f011eb73d6043d2e6db9d2c101195ae2801f2..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index ad2908d513cd3871448dfcdd5627b0426ef1fba4..01b76255800579a44ca5bf0e7632f97d1340e8e7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: yubikey-personalization
 Section: utils
 Priority: extra
 Maintainer: Tollef Fog Heen <tfheen@debian.org>
-Build-Depends: debhelper (>= 7.0.50), autotools-dev, libusb-1.0-0-dev, libyubikey-dev(>= 1.5), chrpath, pkg-config, dh-autoreconf
+Build-Depends: debhelper (>= 8.1.3~), autotools-dev, libusb-1.0-0-dev, libyubikey-dev(>= 1.5), chrpath, pkg-config, dh-autoreconf
 Standards-Version: 3.8.2
 Homepage: http://code.google.com/p/yubikey-personalization/
 
@@ -21,6 +21,7 @@ Package: libykpers-1-1
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Personalization tool for Yubikey OTP tokens
  Yubikeys are USB tokens that act like keyboards and generate one-time
  or static passwords.

diff --git a/debian/libykpers-1-1.install b/debian/libykpers-1-1.install
index 8ada36f0c2adbcefb6a36ad0df0ddae85481c0d3..7aaddec47ed047c82875e62c6e35f3a197ddb1bc 100644 (file)
--- a/debian/libykpers-1-1.install
+++ b/debian/libykpers-1-1.install
@@ -1 +1 @@
-usr/lib/libykpers-1.so.*
+usr/lib/*/libykpers-1.so.*

diff --git a/debian/libykpers-1-dev.install b/debian/libykpers-1-dev.install
index 7777de742f077cdaf1caf3a47251d670338675c9..b8e328041cb5c8d5df2161a3a5d37653f74e6858 100644 (file)
--- a/debian/libykpers-1-dev.install
+++ b/debian/libykpers-1-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libykpers-1.so
-usr/lib/libykpers-1.a
-usr/lib/pkgconfig
+usr/lib/*/libykpers-1.so
+usr/lib/*/libykpers-1.a
+usr/lib/*/pkgconfig
 usr/include/ykpers-1