Revert "Add Multiarch support"

This reverts commit 47932411902d1d9e4b98e56613b825287fce37fe.

Conflicts:
	debian/changelog
	debian/control
	debian/rules

Reverted to debhelper 8, rather than 7 as in original commit.

6 files changed, 10 insertions, 18 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 db3cf36..3100c3c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,14 @@ Source: libconfig
 Priority: optional
 Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
 Uploaders: Jonathan McCrohan <jmccrohan@gmail.com>
-Build-Depends: debhelper (>= 9), autotools-dev, texinfo, texlive-latex-base
+Build-Depends: debhelper (>= 8~), autotools-dev, texinfo, texlive-latex-base
 Standards-Version: 3.9.3
 Homepage: http://www.hyperrealm.com/libconfig/
 Section: libs
 
 Package: libconfig9
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
 Description: parsing and manipulation of structured configuration files
  This library features a fully reentrant parser and includes bindings for
  both the C and C++ programming languages. It runs on modern POSIX-compliant
@@ -23,9 +21,7 @@ Description: parsing and manipulation of structured configuration files
 
 Package: libconfig++9
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
 Description: parsing and manipulation of structured configuration files(C++ binding)
  This library features a fully reentrant parser and includes bindings for
  both the C and C++ programming languages. It runs on modern POSIX-compliant
@@ -44,7 +40,6 @@ Replaces: libconfig8-dev (<< 1.4.8)
 Breaks: libconfig8-dev (<< 1.4.8)
 Depends: libconfig9 (= ${binary:Version}), pkg-config (>= 0.20), ${misc:Depends}
 Recommends: libconfig-doc
-Multi-Arch: same
 Description: parsing and manipulation of structured config files(development)
  This library features a fully reentrant parser and includes bindings for
  both the C and C++ programming languages. It runs on modern POSIX-compliant
@@ -79,7 +74,6 @@ Replaces: libconfig++8-dev (<< 1.4.8)
 Breaks: libconfig++8-dev (<< 1.4.8)
 Depends: libconfig++9 (= ${binary:Version}), libconfig-dev,
  pkg-config (>= 0.20), ${misc:Depends}
-Multi-Arch: same
 Description: parsing and manipulation of structured config files(C++ development)
  This library features a fully reentrant parser and includes bindings for
  both the C and C++ programming languages. It runs on modern POSIX-compliant
@@ -113,7 +107,6 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: libconfig9 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
 Description: parsing and manipulation of structured config files(debug symbols)
  This library features a fully reentrant parser and includes bindings for
  both the C and C++ programming languages. It runs on modern POSIX-compliant
@@ -130,7 +123,6 @@ Section: debug
 Priority: extra
 Architecture: any
 Depends: libconfig++9 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
 Description: parsing and manipulation of structured config files(C++ debug symbols)
  This library features a fully reentrant parser and includes bindings for
  both the C and C++ programming languages. It runs on modern POSIX-compliant
diff --git a/debian/libconfig++-dev.install b/debian/libconfig++-dev.install
index 75c2d47..0cf05e1 100644
--- a/debian/libconfig++-dev.install
+++ b/debian/libconfig++-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/libconfig.h++
-debian/tmp/usr/lib/*/libconfig++.a
-debian/tmp/usr/lib/*/libconfig++.so
-debian/tmp/usr/lib/*/pkgconfig/libconfig++.pc
+debian/tmp/usr/lib/libconfig++.a
+debian/tmp/usr/lib/libconfig++.so
+debian/tmp/usr/lib/pkgconfig/libconfig++.pc
diff --git a/debian/libconfig++9.install b/debian/libconfig++9.install
index f63c7e9..35c586e 100644
--- a/debian/libconfig++9.install
+++ b/debian/libconfig++9.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*/libconfig++.so.9*
+debian/tmp/usr/lib/libconfig++.so.9*
diff --git a/debian/libconfig-dev.install b/debian/libconfig-dev.install
index 375054d..b87a91b 100644
--- a/debian/libconfig-dev.install
+++ b/debian/libconfig-dev.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/include/libconfig.h
-debian/tmp/usr/lib/*/libconfig.a
-debian/tmp/usr/lib/*/libconfig.so
-debian/tmp/usr/lib/*/pkgconfig/libconfig.pc
+debian/tmp/usr/lib/libconfig.a
+debian/tmp/usr/lib/libconfig.so
+debian/tmp/usr/lib/pkgconfig/libconfig.pc
diff --git a/debian/libconfig9.install b/debian/libconfig9.install
index 9064128..b73360c 100644
--- a/debian/libconfig9.install
+++ b/debian/libconfig9.install
@@ -1 +1 @@
-debian/tmp/usr/lib/*/libconfig.so.9*
+debian/tmp/usr/lib/libconfig.so.9*