From 3d9394c18ca528ac78197007d1a2dfff6f401920 Mon Sep 17 00:00:00 2001
From: Jonathan McCrohan <jmccrohan@gmail.com>
Date: Sun, 13 May 2012 20:07:19 +0100
Subject: Revert "Add Multiarch support"

This reverts commit d070ed533fe8afdc672c6f04875f2c73f478c196.

Conflicts:

	debian/control
---
 debian/compat                   | 2 +-
 debian/control                  | 8 +-------
 debian/libphidget21-0.install   | 2 +-
 debian/libphidget21-dev.install | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/debian/compat b/debian/compat
index ec63514..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+8
diff --git a/debian/control b/debian/control
index 6b7775e..a74852e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,13 @@
 Source: libphidget21
 Priority: optional
 Maintainer: Jonathan McCrohan <jmccrohan@gmail.com>
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, libusb-1.0-0-dev, default-jdk
+Build-Depends: debhelper (>= 8), autotools-dev, dh-autoreconf, libusb-1.0-0-dev, default-jdk
 Standards-Version: 3.9.3
 Section: libs
 Homepage: http://www.phidgets.com
 
 Package: libphidget21-0
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Phidgets runtime library
  Runtime library for the libphidgets API.
@@ -21,8 +19,6 @@ Description: Phidgets runtime library
 Package: libphidget21-dev
 Section: libdevel
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
 Depends: libphidget21-0 (= ${binary:Version}), libusb-dev, ${misc:Depends}
 Description: Phidgets development files
  This package contains Development libraries and header files for the 
@@ -36,8 +32,6 @@ Package: libphidget21-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
 Depends: libphidget21-0 (= ${binary:Version}), ${misc:Depends}
 Description: Phidgets debug symbols
  This package contains debugging symbols for the libphidget API.
diff --git a/debian/libphidget21-0.install b/debian/libphidget21-0.install
index b9bfe3b..916be9c 100644
--- a/debian/libphidget21-0.install
+++ b/debian/libphidget21-0.install
@@ -1,2 +1,2 @@
-usr/lib/*/lib*.so.*
+usr/lib/lib*.so.*
 udev/99-phidgets.rules lib/udev/rules.d
diff --git a/debian/libphidget21-dev.install b/debian/libphidget21-dev.install
index 7df81cd..5774e64 100644
--- a/debian/libphidget21-dev.install
+++ b/debian/libphidget21-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig/*
+usr/lib/lib*.so
+usr/lib/pkgconfig/*
-- 
cgit v1.2.3