Follow multi-arch policy

debian/changelog

@@ -1,10 +1,14 @@
 nut (2.6.4-3) UNRELEASED; urgency=low
 
+  [ Arnaud Quette ]
   * debian/control, debian/nut-ipmi.{install,manpages}: create IPMI
     support package
   * debian/nut-server.install: only install USB udev rules
 
- -- Arnaud Quette <aquette@debian.org>  Fri, 08 Jun 2012 23:23:03 +0200
+  [ Laurent Bigonville ]
+  * Follow multi-arch policy
+
+ -- Laurent Bigonville <bigon@debian.org>  Sun, 12 Aug 2012 22:18:36 +0200
 
 nut (2.6.4-2) unstable; urgency=low
 

debian/control

@@ -3,8 +3,8 @@ Section: admin
 Priority: optional
 Maintainer: Arnaud Quette <aquette@debian.org>
 Uploaders: Laurent Bigonville <bigon@debian.org>
-Build-Depends: debhelper (>= 8),
-               cdbs (>= 0.4.90~),
+Build-Depends: debhelper (>= 8.1.3),
+               cdbs (>= 0.4.93~),
                libgd2-xpm-dev | libgd2-noxpm-dev,
                libsnmp-dev | libsnmp9-dev,
                libusb-dev (>= 0.1.8),
@@ -166,6 +166,8 @@ Description: network UPS tools - documentation
 Package: libupsclient1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: network UPS tools - client library
  Network UPS Tools (NUT) is a client/server monitoring system that
  allows computers to share uninterruptible power supply (UPS) and

debian/libupsclient1-dev.install

@@ -1,4 +1,5 @@
-debian/tmp/lib/libupsclient.so
-debian/tmp/lib/libupsclient.a
-debian/tmp/usr/lib/pkgconfig/
-debian/tmp/usr/include
+lib/*/libupsclient.so
+usr/lib/*/libupsclient.so
+lib/*/libupsclient.a
+usr/lib/*/pkgconfig/
+usr/include

debian/libupsclient1-dev.links

@@ -1 +0,0 @@
-/lib/libupsclient.so.1.1.0 /usr/lib/libupsclient.so

debian/libupsclient1.install

@@ -1 +1 @@
-debian/tmp/lib/libupsclient.so.*
+lib/*/libupsclient.so.*

debian/rules

@@ -14,7 +14,8 @@ DEB_CONFIGURE_PREFIX      :=
 DEB_CONFIGURE_SYSCONFDIR  := /etc/nut
 DEB_CONFIGURE_INCLUDEDIR  := /usr/include
 DEB_CONFIGURE_MANDIR      := /usr/share/man
-DEB_CONFIGURE_EXTRA_FLAGS := --without-ssl \
+DEB_CONFIGURE_EXTRA_FLAGS := --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+                             --without-ssl \
 	                     --with-cgi \
 	                     --with-dev \
 	                     --enable-static \
@@ -25,7 +26,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --without-ssl \
 	                     --with-htmlpath=/usr/share/nut/www \
 	                     --with-pidpath=/var/run/nut \
 	                     --datadir=/usr/share/nut \
-	                     --with-pkgconfig-dir=/usr/lib/pkgconfig \
+	                     --with-pkgconfig-dir=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
 	                     --with-user=nut --with-group=nut
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
@@ -61,6 +62,10 @@ common-install-arch::
 		mv $${f} $(CURDIR)/debian/tmp/etc/nut/$${nf};  \
 	done
 
+	# Create -dev symlink under /usr
+	ln -s /lib/$(DEB_HOST_MULTIARCH)/libupsclient.so.1.1.0 \
+		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libupsclient.so
+
 common-install-indep::
 	#install documentation
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/nut-doc/pdf