diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 38 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/libconfig++8.install | 1 | ||||
| -rw-r--r-- | debian/libconfig++9-dev.install (renamed from debian/libconfig++8-dev.install) | 3 | ||||
| -rw-r--r-- | debian/libconfig++9.install | 1 | ||||
| -rw-r--r-- | debian/libconfig8.install | 2 | ||||
| -rw-r--r-- | debian/libconfig9-dev.docs (renamed from debian/libconfig8-dev.docs) | 0 | ||||
| -rw-r--r-- | debian/libconfig9-dev.install (renamed from debian/libconfig8-dev.install) | 3 | ||||
| -rw-r--r-- | debian/libconfig9.info (renamed from debian/libconfig8.info) | 0 | ||||
| -rw-r--r-- | debian/libconfig9.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 128 | ||||
| -rw-r--r-- | debian/shlibs | 4 |
13 files changed, 52 insertions, 139 deletions
diff --git a/debian/changelog b/debian/changelog index 3c1d53f..965c09b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libconfig (1.4) unstable; urgency=low + + * new upstream release + * libconfig++9-dev no longer depends on libconfig9-dev + + -- Mark Lindner <hyperrealm@gmail.com> Fri, 21 Aug 2009 00:00:00 +0800 + libconfig (1.3.2) unstable; urgency=low * new upstream release diff --git a/debian/control b/debian/control index 7c3b01d..fdc0a8c 100644 --- a/debian/control +++ b/debian/control @@ -2,16 +2,16 @@ Source: libconfig Priority: optional Maintainer: Klaus Schneider <kschn@users.sourceforge.net> Uploaders: Julien Danjou <acid@debian.org> -Build-Depends: debhelper (>= 5), autotools-dev +Build-Depends: debhelper (>= 5), autotools-dev, texinfo Standards-Version: 3.8.0 Homepage: http://www.hyperrealm.com/libconfig/ Section: libs -Package: libconfig8 +Package: libconfig9 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: parsing and manipulation of structured configuration files +Description: processing 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 @@ -20,11 +20,11 @@ Description: parsing and manipulation of structured configuration files This library allows parsing, manipulating and writing structured configuration files. -Package: libconfig++8 +Package: libconfig++9 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: parsing and manipulation of structured configuration files(C++ binding) +Description: processing 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,12 +35,13 @@ Description: parsing and manipulation of structured configuration files(C++ bind . This is the C++ binding. -Package: libconfig8-dev +Package: libconfig9-dev Section: libdevel Architecture: any Provides: libconfig-dev -Depends: libconfig8 (= ${binary:Version}), pkg-config (>= 0.20) -Description: parsing and manipulation of structured config files(development) +Depends: libconfig9 (= ${binary:Version}), pkg-config (>= 0.20) +Conflicts: libconfigduo6-dev, libconfig6-dev +Description: processing 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 @@ -58,12 +59,13 @@ Description: parsing and manipulation of structured config files(development) This package contains the files needed in order to use libconfig in your own programs. -Package: libconfig++8-dev +Package: libconfig++9-dev Section: libdevel Architecture: any Provides: libconfig++-dev -Depends: libconfig++8 (= ${binary:Version}), libconfig8 (= ${binary:Version}), pkg-config (>= 0.20) -Description: parsing and manipulation of structured config files(C++ development) +Depends: libconfig++9 (= ${binary:Version}), libconfig9 (= ${binary:Version}), pkg-config (>= 0.20) +Conflicts: libconfigduo6-dev, libconfig++6-dev +Description: processing 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 @@ -80,3 +82,17 @@ Description: parsing and manipulation 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 +Section: debug +Architecture: any +Depends: libconfig9 (= ${binary:Version}) +Description: debug symbols for libconfig9 + This package provides debugging information for libconfig library + +Package: libconfig++9-dbg +Section: debug +Architecture: any +Depends: libconfig++9 (= ${binary:Version}) +Description: debug symbols for libconfig++9 + This package provides debugging information for C++ API of libconfig library diff --git a/debian/copyright b/debian/copyright index 1c41e22..e6e57d0 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,7 +10,7 @@ Upstream Author: Mark A Lindner Glenn Herteg - Enhancements, bugfixes, documentation corrections. -Copyright: Copyright (C) 2005-2008 Mark A Lindner +Copyright: Copyright (C) 2005-2009 Mark A Lindner License: (LGPL-2.1) diff --git a/debian/libconfig++8.install b/debian/libconfig++8.install deleted file mode 100644 index 827bed5..0000000 --- a/debian/libconfig++8.install +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/lib/libconfig++.so.8* diff --git a/debian/libconfig++8-dev.install b/debian/libconfig++9-dev.install index 52e3764..642348a 100644 --- a/debian/libconfig++8-dev.install +++ b/debian/libconfig++9-dev.install @@ -1,4 +1,5 @@ debian/tmp/usr/include/libconfig.h++ debian/tmp/usr/lib/libconfig++.a debian/tmp/usr/lib/libconfig++.so -libconfig++.pc usr/lib/pkgconfig +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 new file mode 100644 index 0000000..35c586e --- /dev/null +++ b/debian/libconfig++9.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libconfig++.so.9* diff --git a/debian/libconfig8.install b/debian/libconfig8.install deleted file mode 100644 index ff402ce..0000000 --- a/debian/libconfig8.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/tmp/usr/lib/libconfig.so.8* -debian/tmp/usr/lib/libconfig.la diff --git a/debian/libconfig8-dev.docs b/debian/libconfig9-dev.docs index 49e707d..49e707d 100644 --- a/debian/libconfig8-dev.docs +++ b/debian/libconfig9-dev.docs diff --git a/debian/libconfig8-dev.install b/debian/libconfig9-dev.install index 6393be1..5b5ce02 100644 --- a/debian/libconfig8-dev.install +++ b/debian/libconfig9-dev.install @@ -1,4 +1,5 @@ debian/tmp/usr/include/libconfig.h debian/tmp/usr/lib/libconfig.a debian/tmp/usr/lib/libconfig.so -libconfig.pc usr/lib/pkgconfig +debian/tmp/usr/lib/libconfig.la +debian/tmp/usr/lib/pkgconfig/libconfig.pc diff --git a/debian/libconfig8.info b/debian/libconfig9.info index 628d7f3..628d7f3 100644 --- a/debian/libconfig8.info +++ b/debian/libconfig9.info diff --git a/debian/libconfig9.install b/debian/libconfig9.install new file mode 100644 index 0000000..aba7b37 --- /dev/null +++ b/debian/libconfig9.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libconfig.so.9* + diff --git a/debian/rules b/debian/rules index 2331b8f..d758c24 100755 --- a/debian/rules +++ b/debian/rules @@ -24,122 +24,11 @@ else CFLAGS += -O2 endif -# shared library versions, option 1 -version=6.1.1 -major=6 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` - -config.status: configure - dh_testdir - test -e config.sub -a -L config.sub || \ - ln -sf /usr/share/misc/config.sub config.sub - test -e config.guess -a -L config.guess || \ - ln -sf /usr/share/misc/config.guess config.guess - - ./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 - - # Add here commands to compile the package. - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - - [ ! -f Makefile ] || $(MAKE) distclean - - rm -f build-stamp - - $(RM) config.guess config.sub - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - -# 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_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 -#!/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, option 1 -version=2.0.5 -major=2 -# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so -#version=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` -#major=`ls src/.libs/lib*.so.* | \ -# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'` +# 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 @@ -148,7 +37,6 @@ config.status: configure --infodir=\$${prefix}/share/info \ CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" - build: build-stamp build-stamp: config.status dh_testdir @@ -167,8 +55,6 @@ endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - - dh_clean install: build @@ -190,6 +76,8 @@ binary-arch: build install 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 @@ -214,4 +102,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +.PHONY: build clean binary-indep binary-arch binary install diff --git a/debian/shlibs b/debian/shlibs index 6026085..cb75f12 100644 --- a/debian/shlibs +++ b/debian/shlibs @@ -1,2 +1,2 @@ -libconfig 8 libconfig8 -libconfig++ 8 libconfig++8 +libconfig 9 libconfig9 +libconfig++ 9 libconfig++9 |