23 files changed, 214 insertions, 292 deletions

diff --git a/debian/additions/examples/c++/debian.Makefile b/debian/additions/examples/c++/debian.Makefile
new file mode 100644
index 0000000..bcd48bb
--- /dev/null
+++ b/debian/additions/examples/c++/debian.Makefile
@@ -0,0 +1,5 @@
+all: example1 example2 example3 example4
+
+LOADLIBES += $(shell pkg-config libconfig++ --libs)
+CXXFLAGS += -Wall
+CXXFLAGS += -O2
diff --git a/debian/additions/examples/c/debian.Makefile b/debian/additions/examples/c/debian.Makefile
new file mode 100644
index 0000000..a5e28bd
--- /dev/null
+++ b/debian/additions/examples/c/debian.Makefile
@@ -0,0 +1,5 @@
+all: example1 example2 example3
+
+LOADLIBES += $(shell pkg-config libconfig --libs)
+CFLAGS += -Wall
+CFLAGS += -O2
diff --git a/debian/changelog b/debian/changelog
index 7e9e00a..0de651e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,26 +1,82 @@
-libconfig (1.4.8) unstable; urgency=low
+libconfig (1.4.8-5) unstable; urgency=low
 
-  * New upstream release
-  * Update debian/control to reflect current Debian packages
-  * Add texlive-latex-base to Build-Depends
+  * Switch to dh_9 style rules file
+    - Hardened buildflags now provided automatically
+    - Fixes E-binary-arch-produces-all buildd warning
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Tue, 26 Jun 2012 21:41:22 +0100
+
+libconfig (1.4.8-4) unstable; urgency=low
+
+  * Add C++ hardened buildflags
+    - Thanks to Simon Ruderich for the patch (closes: #662225)
+  * Fix libconfig(++)8-dev transition packages
+    - Set section as oldlibs
+    - Set priority as extra
+    - Remove package descriptions
+  * Add Multiarch support 
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Fri, 06 Apr 2012 14:28:39 +0100
+
+libconfig (1.4.8-3) unstable; urgency=low
+
+  * Add Replaces+Breaks: libconfig(++)8-dev to libconfig(++)-dev
+     - Thanks to Andreas Beckmann for reporting (closes: #662643)
+  * Enable hardened buildflags
+     - Thanks to Simon Ruderich for the patch (closes: #662225)
+  * Fix incorrect section and arch for transitional packages.
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Mon, 05 Mar 2012 22:01:29 +0000
+
+libconfig (1.4.8-2) unstable; urgency=low
+
+  * Upload to unstable
+  * Update to S-V 3.9.3
+  * debian/rules now uses dpkg-buildflags
+  * Provide full transitional packages to help -dev package rename
+  * Multiple lintian fixes
+    - out-of-date-standards-version
+    - copyright-with-old-dh-make-debian-copyright
+    - extended-description-is-probably-too-short
+    - unneeded-build-dep-on-quilt
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Thu, 01 Mar 2012 02:11:47 +0000
+
+libconfig (1.4.8-1~exp1) experimental; urgency=low
+
+  * New upstream release (closes: #583528)
+    - soname bump to 9
+  * Update to S-V 3.9.2
+  * Update to Debhelper v7
+  * Refresh Build-Depends packages
+  * Add debug packages
+  * Remove soname from -dev package names
+    - Build as virtual packages for reverse dependency purposes.
+  * Fix examples (closes: #632081)
+
+ -- Jonathan McCrohan <jmccrohan@gmail.com>  Sat, 11 Feb 2012 18:13:26 +0000
 
- -- Jonathan McCrohan <jmccrohan@gmail.com>  Sun, 06 Nov 2011 01:16:39 +0000
+libconfig (1.3.2-2) unstable; urgency=low
 
-libconfig (1.4) unstable; urgency=low
+  * Removed "conflicts" with older sonames (Closes: #536635)
+  * Added missing compile-time libconfig++8-dev dependencies 
+    (libconfig8-dev) (Closes: #537311)
 
-  * new upstream release
-  * libconfig++9-dev no longer depends on libconfig9-dev
+  * Removed libtool's ".la" files (clients should use pkg-config)
 
- -- Mark Lindner <hyperrealm@gmail.com>  Fri, 21 Aug 2009 00:00:00 +0800
+  * Updated to S-V 3.8.3 with no changes
 
-libconfig (1.3.2) unstable; urgency=low
+  * With many thanks to Christian Hammers, who kindly checked the package.
 
-  * new upstream release
-  * use official Debian files as basis
-  * libconfig++8-dev depends on libconfig8-dev because libconfig.h++
-    includes libconfig.h which is in libconfig8-dev
+ -- Jose Luis Tallon <jltallon@adv-solutions.net>  Sun, 13 Sep 2009 04:25:14 +0200
 
- -- Klaus Schneider <kschn@users.sourceforge.net>  Wed, 18 Feb 2009 15:26:32 +0100
+libconfig (1.3.2-1) unstable; urgency=low
+
+  * New upstream release (Closes: #521725)
+    - soname bump to 8
+    - Updated to S-V 3.8.1 with no changes
+
+ -- Jose Luis Tallon <jltallon@adv-solutions.net>  Tue, 07 Apr 2009 21:13:16 +0200
 
 libconfig (1.3.1-1) unstable; urgency=low
 
@@ -52,26 +108,3 @@ libconfig (0.9-1) unstable; urgency=low
 
  -- Jose Luis Tallon <jltallon@adv-solutions.net>  Tue, 10 Oct 2006 01:42:09 +0200
 
-libconfigduo (1.3.1) unstable; urgency=low
-
-  * Release 1.3.1
-
- -- Klaus Schneider <kschn@users.sourceforge.net>  Thu, 13 Nov 2008 17:05:12 +0100
-
-libconfigduo (1.3) unstable; urgency=low
-
-  * Release 1.3
-
- -- Klaus Schneider <kschn@users.sourceforge.net>  Fri, 4 Apr 2008 09:36:42 +0200
-
-libconfigduo (1.2.1-1) unstable; urgency=low
-
-  * Release 1.2.1
-
- -- Klaus Schneider <kschn@users.sourceforge.net>  Thu, 31 Jan 2008 11:25:21 +0100
-
-libconfigduo (1.1.1-1) unstable; urgency=low
-
-  * Initial release
-
- -- Klaus Schneider <kschn@users.sourceforge.net>  Mon, 25 Jun 2007 16:21:56 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 5ac5e83..db3cf36 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,18 @@
 Source: libconfig
 Priority: optional
-Maintainer: Klaus Schneider <kschn@users.sourceforge.net>
-Uploaders: Julien Danjou <acid@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, texinfo, texlive-latex-base
-Standards-Version: 3.8.0
+Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
+Uploaders: Jonathan McCrohan <jmccrohan@gmail.com>
+Build-Depends: debhelper (>= 9), autotools-dev, texinfo, texlive-latex-base
+Standards-Version: 3.9.3
 Homepage: http://www.hyperrealm.com/libconfig/
 Section: libs
 
 Package: libconfig9
-Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: processing of structured configuration files
+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
  systems such as Linux, Solaris, and Mac OS X (Darwin), as well as on 
@@ -21,10 +22,11 @@ Description: processing of structured configuration files
  files.
 
 Package: libconfig++9
-Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: processing of structured configuration files (C++ binding)
+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
  systems such as Linux, Solaris, and Mac OS X (Darwin), as well as on 
@@ -35,13 +37,15 @@ Description: processing of structured configuration files (C++ binding)
  .
  This is the C++ binding.
 
-Package: libconfig9-dev
+Package: libconfig-dev
 Section: libdevel
 Architecture: any
-Provides: libconfig-dev
-Depends: libconfig9 (= ${binary:Version}), pkg-config (>= 0.20)
-Conflicts: libconfig8-dev
-Description: processing of structured config files (development)
+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
  systems such as Linux, Solaris, and Mac OS X (Darwin), as well as on 
@@ -59,13 +63,24 @@ Description: processing of structured config files (development)
  This package contains the files needed in order to use libconfig
  in your own programs.
 
-Package: libconfig++9-dev
+Package: libconfig8-dev
+Depends: libconfig-dev, ${misc:Depends}
+Architecture: any
+Section: oldlibs
+Priority: extra
+Description: Transitional package for libconfig-dev
+ This is a transitional package for libconfig-dev, and can be safely removed
+ when no other package depends on it.
+
+Package: libconfig++-dev
 Section: libdevel
 Architecture: any
-Provides: libconfig++-dev
-Depends: libconfig++9 (= ${binary:Version}), libconfig9 (= ${binary:Version}), pkg-config (>= 0.20)
-Conflicts: libconfig++8-dev
-Description: processing of structured config files (C++ development)
+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
  systems such as Linux, Solaris, and Mac OS X (Darwin), as well as on 
@@ -83,16 +98,63 @@ Description: processing of structured config files (C++ development)
  This package contains the files needed in order to use libconfig
  in your own C++ programs.
 
-Package: libconfig9-dbg
+Package: libconfig++8-dev
+Depends: libconfig++-dev, ${misc:Depends}
+Architecture: any
+Section: oldlibs
+Priority: extra
+Description: Transitional package for libconfig++-dev
+ This is a transitional package for libconfig++-dev, and can be safely removed
+ when no other package depends on it.
+
+
+Package: libconfig-dbg
 Section: debug
+Priority: extra
 Architecture: any
-Depends: libconfig9 (= ${binary:Version})
-Description: debug symbols for libconfig9
- This package provides debugging information for libconfig library
+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
+ systems such as Linux, Solaris, and Mac OS X (Darwin), as well as on
+ Microsoft Windows 2000/XP and later (Visual Studio or MinGW).
+ .
+ This library allows parsing, manipulating and writing structured configuration
+ files.
+ .
+ This package provides debugging information for the libconfig library.
 
-Package: libconfig++9-dbg
+Package: libconfig++-dbg
 Section: debug
+Priority: extra
 Architecture: any
-Depends: libconfig++9 (= ${binary:Version})
-Description: debug symbols for libconfig++9
- This package provides debugging information for C++ API of libconfig library
+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
+ systems such as Linux, Solaris, and Mac OS X (Darwin), as well as on
+ Microsoft Windows 2000/XP and later (Visual Studio or MinGW).
+ .
+ This library allows parsing, manipulating and writing structured configuration
+ files.
+ .
+ This package provides debugging information for the libconfig++ library.
+
+Package: libconfig-doc
+Section: doc
+Architecture: all
+Replaces: libconfig-dev (<= 1.4.8)
+Breaks: libconfig-dev (<= 1.4.8)
+Depends: ${misc:Depends}
+Description: parsing and manipulation of structured config files(Documentation)
+ This library features a fully reentrant parser and includes bindings for
+ both the C and C++ programming languages. It runs on modern POSIX-compliant
+ systems such as Linux, Solaris, and Mac OS X (Darwin), as well as on
+ Microsoft Windows 2000/XP and later (Visual Studio or MinGW).
+ .
+ This library allows parsing, manipulating and writing structured configuration
+ files.
+ .
+ This package provides documentation for the libconfig library.
diff --git a/debian/copyright b/debian/copyright
index e6e57d0..c5556f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -30,36 +30,7 @@ On Debian systems, the full text of GNU's Lesser General Public License can
 be found at /usr/share/common-licenses/LGPL-2.1
 
 
-The Debian packaging is (C) 2006-2008, Jose Luis Tallon <jltallon@adv-solutions.net>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-This package was debianized by Klaus Schneider <kschn@users.sourceforge.net> on
-Mon, 25 Jun 2007 16:21:56 +0200.
-
-It was downloaded from http://www.hyperrealm.com/libconfig/libconfig.html
-
-Upstream Author: Mark A. Lindner
-
-Copyright: (c) 2005-2009 Mark A. Lindner
-
-License:
-
-    This package is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This package is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-
-The Debian packaging is (C) 2007, Klaus Schneider <kschn@users.sourceforge.net> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is copyright 2006-2009, Jose Luis Tallon 
+<jltallon@adv-solutions.net>, copyright 2011-2012, Jonathan McCrohan
+<jmccrohan@gmail.com> and is licensed under the GPL version 2, see 
+`/usr/share/common-licenses/GPL-2'.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/libconfig++-dev.examples b/debian/libconfig++-dev.examples
new file mode 100644
index 0000000..2d79c34
--- /dev/null
+++ b/debian/libconfig++-dev.examples
@@ -0,0 +1,4 @@
+examples/c++/example.cfg
+examples/c++/invalid.cfg
+examples/c++/example*.cpp
+debian/additions/examples/c++/debian.Makefile
diff --git a/debian/libconfig++-dev.install b/debian/libconfig++-dev.install
new file mode 100644
index 0000000..75c2d47
--- /dev/null
+++ b/debian/libconfig++-dev.install
@@ -0,0 +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
diff --git a/debian/libconfig++9-dev.install b/debian/libconfig++9-dev.install
deleted file mode 100644
index 642348a..0000000
--- a/debian/libconfig++9-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/include/libconfig.h++
-debian/tmp/usr/lib/libconfig++.a
-debian/tmp/usr/lib/libconfig++.so
-debian/tmp/usr/lib/libconfig++.la
-debian/tmp/usr/lib/pkgconfig/libconfig++.pc
diff --git a/debian/libconfig++9.install b/debian/libconfig++9.install
index 35c586e..f63c7e9 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.examples b/debian/libconfig-dev.examples
new file mode 100644
index 0000000..af50e71
--- /dev/null
+++ b/debian/libconfig-dev.examples
@@ -0,0 +1,3 @@
+examples/c/example.cfg
+examples/c/example*.c
+debian/additions/examples/c/debian.Makefile
diff --git a/debian/libconfig9.info b/debian/libconfig-dev.info
index 628d7f3..628d7f3 100644
--- a/debian/libconfig9.info
+++ b/debian/libconfig-dev.info
diff --git a/debian/libconfig-dev.install b/debian/libconfig-dev.install
new file mode 100644
index 0000000..375054d
--- /dev/null
+++ b/debian/libconfig-dev.install
@@ -0,0 +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
diff --git a/debian/libconfig-doc.doc-base b/debian/libconfig-doc.doc-base
new file mode 100644
index 0000000..281715e
--- /dev/null
+++ b/debian/libconfig-doc.doc-base
@@ -0,0 +1,9 @@
+Document: libconfig9
+Title: libconfig manual
+Author: Mark A Lindner
+Abstract: This manual describes what libconfig is
+ and how it can be used to parse configuration files
+Section: Programming/C
+
+Format: PDF
+Files: /usr/share/doc/libconfig-doc/libconfig.pdf.gz
diff --git a/debian/libconfig9-dev.docs b/debian/libconfig-doc.docs
index 49e707d..49e707d 100644
--- a/debian/libconfig9-dev.docs
+++ b/debian/libconfig-doc.docs
diff --git a/debian/libconfig9-dev.install b/debian/libconfig9-dev.install
deleted file mode 100644
index 5b5ce02..0000000
--- a/debian/libconfig9-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/tmp/usr/include/libconfig.h
-debian/tmp/usr/lib/libconfig.a
-debian/tmp/usr/lib/libconfig.so
-debian/tmp/usr/lib/libconfig.la
-debian/tmp/usr/lib/pkgconfig/libconfig.pc
diff --git a/debian/libconfig9.install b/debian/libconfig9.install
index aba7b37..9064128 100644
--- a/debian/libconfig9.install
+++ b/debian/libconfig9.install
@@ -1,2 +1 @@
-debian/tmp/usr/lib/libconfig.so.9*
-
+debian/tmp/usr/lib/*/libconfig.so.9*
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/debian/patches/series
diff --git a/debian/rules b/debian/rules
index d758c24..b070a1e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,105 +1,15 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-# shared library versions
-version=`ls lib/.libs/lib*.so.* | \
-  awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-major=`ls lib/.libs/lib*.so.* | \
-  awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-config.status: configure
-	dh_testdir
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-                    --prefix=/usr --mandir=\$${prefix}/share/man \
-                    --infodir=\$${prefix}/share/info \
-                    CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE)
-	$(MAKE) pdf
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	-$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_strip -v --package=libconfig9 --dbg-package=libconfig9-dbg
-	dh_strip -v --package=libconfig++9 --dbg-package=libconfig++9-dbg
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+# # export DH_VERBOSE=1
+
+override_dh_auto_build:
+	$(MAKE) -C doc pdf
+	dh_auto_build
+
+override_dh_strip:
+	dh_strip -p libconfig9 --dbg-package=libconfig-dbg
+	dh_strip -p libconfig++9 --dbg-package=libconfig++-dbg
+	
+%:
+	dh $@ --with autotools-dev
diff --git a/debian/shlibs b/debian/shlibs
deleted file mode 100644
index cb75f12..0000000
--- a/debian/shlibs
+++ /dev/null
@@ -1,2 +0,0 @@
-libconfig 9 libconfig9
-libconfig++ 9 libconfig++9
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/libconfig.spec b/libconfig.spec
deleted file mode 100644
index b1b03d8..0000000
--- a/libconfig.spec
+++ /dev/null
@@ -1,77 +0,0 @@
-Name:		libconfig
-Version:	1.4.9
-Release:	1
-Summary:	C/C++ Configuration File Library
-
-Group:		System Environment/Libraries
-License:	LGPL
-URL:		http://hyperrealm.com/main.php?s=libconfig
-Source0:	%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
-
-Packager:	Deneys S. Maartens  <dsm@tlabs.ac.za>
-
-BuildRequires:	texinfo
-
-%description
-%{name} is a simple library for processing structured configuration
-files. The file format is more compact and more readable than XML. And
-unlike XML, it is type-aware, so it is not necessary to do string
-parsing in application code. The library includes bindings for both
-the C and C++ languages. It works on POSIX-compliant UNIX systems.
-
-%package devel
-Summary:	%{name} development package
-Group:		Development/Libraries
-Requires:	%{name} = %{version}
-
-%description devel
-Development files for %{name}.
-
-%prep
-%setup -q
-
-%build
-%configure
-make %{?_smp_mflags}
-make html
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-ldconfig
-
-%postun
-ldconfig
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README
-%{_libdir}/%{name}.so*
-%{_libdir}/%{name}++.so*
-
-%files devel
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING.LIB ChangeLog INSTALL NEWS README
-%doc doc/%{name}.html
-%doc test.cfg
-%doc examples/c/*.c
-%doc examples/c++/*.cpp
-%{_infodir}
-%{_includedir}
-%{_libdir}/pkgconfig
-%{_libdir}/%{name}.a
-%{_libdir}/%{name}.la
-%{_libdir}/%{name}++.a
-%{_libdir}/%{name}++.la
-
-%changelog
-* Wed Aug 19 2007  Deneys S. Maartens  <dsm@tlabs.ac.za>  1.1.3-1
-- create spec file
-
-# -fin-