From d4b5ddf4bcacd692011f5a597025c38a1262d6ca Mon Sep 17 00:00:00 2001 From: Jose Luis Tallon Date: Sun, 13 Sep 2009 04:25:14 +0200 Subject: Imported Debian patch 1.3.2-2 --- debian/Makefile | 7 ++ debian/additions/sample.c++.Makefile | 15 ++++ debian/additions/sample.c.Makefile | 15 ++++ debian/changelog | 48 +++++-------- debian/control | 14 ++-- debian/copyright | 37 +--------- debian/dirs | 1 + debian/libconfig++8-dev.examples | 2 + debian/libconfig++8-dev.install | 2 +- debian/libconfig8-dev.doc-base | 9 +++ debian/libconfig8-dev.examples | 2 + debian/libconfig8-dev.info | 1 + debian/libconfig8-dev.install | 2 +- debian/libconfig8.install | 1 - debian/rules | 136 +++++------------------------------ debian/source/format | 1 + 16 files changed, 102 insertions(+), 191 deletions(-) create mode 100644 debian/Makefile create mode 100644 debian/additions/sample.c++.Makefile create mode 100644 debian/additions/sample.c.Makefile create mode 100644 debian/dirs create mode 100644 debian/libconfig++8-dev.examples create mode 100644 debian/libconfig8-dev.doc-base create mode 100644 debian/libconfig8-dev.examples create mode 100644 debian/libconfig8-dev.info create mode 100644 debian/source/format diff --git a/debian/Makefile b/debian/Makefile new file mode 100644 index 0000000..2c4a3b7 --- /dev/null +++ b/debian/Makefile @@ -0,0 +1,7 @@ +# +.PHONY: dummy + + + +tidy: dummy + rm -f *~ diff --git a/debian/additions/sample.c++.Makefile b/debian/additions/sample.c++.Makefile new file mode 100644 index 0000000..0d9cef2 --- /dev/null +++ b/debian/additions/sample.c++.Makefile @@ -0,0 +1,15 @@ +# Makefile for libconfig++ - examples + + +sample1: sample1.cpp + $(CC) -o $@ -lconfig++ -lconfig $< + +sample2: sample2.cpp + $(CC) -o $@ -lconfig++ -lconfig $< + +sample3: sample3.cpp + $(CC) -o $@ -lconfig++ -lconfig $< + + +stub: stubcpp.cpp + $(CC) -o $@ -lconfig++ -lconfig $< diff --git a/debian/additions/sample.c.Makefile b/debian/additions/sample.c.Makefile new file mode 100644 index 0000000..bf2f8f5 --- /dev/null +++ b/debian/additions/sample.c.Makefile @@ -0,0 +1,15 @@ +# Makefile for libconfig - examples + + +sample1: sample1.c + $(CC) -o $@ -lconfig $< + +sample2: sample2.c + $(CC) -o $@ -lconfig $< + +sample3: sample3.c + $(CC) -o $@ -lconfig $< + + +stub: stub.c + $(CC) -o $@ -lconfig $< diff --git a/debian/changelog b/debian/changelog index 3c1d53f..7979281 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,24 @@ -libconfig (1.3.2) unstable; urgency=low +libconfig (1.3.2-2) unstable; urgency=low - * 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 + * Removed "conflicts" with older sonames (Closes: #536635) + * Added missing compile-time libconfig++8-dev dependencies + (libconfig8-dev) (Closes: #537311) - -- Klaus Schneider Wed, 18 Feb 2009 15:26:32 +0100 + * Removed libtool's ".la" files (clients should use pkg-config) + + * Updated to S-V 3.8.3 with no changes + + * With many thanks to Christian Hammers, who kindly checked the package. + + -- Jose Luis Tallon Sun, 13 Sep 2009 04:25:14 +0200 + +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 Tue, 07 Apr 2009 21:13:16 +0200 libconfig (1.3.1-1) unstable; urgency=low @@ -37,26 +50,3 @@ libconfig (0.9-1) unstable; urgency=low -- Jose Luis Tallon Tue, 10 Oct 2006 01:42:09 +0200 -libconfigduo (1.3.1) unstable; urgency=low - - * Release 1.3.1 - - -- Klaus Schneider Thu, 13 Nov 2008 17:05:12 +0100 - -libconfigduo (1.3) unstable; urgency=low - - * Release 1.3 - - -- Klaus Schneider Fri, 4 Apr 2008 09:36:42 +0200 - -libconfigduo (1.2.1-1) unstable; urgency=low - - * Release 1.2.1 - - -- Klaus Schneider Thu, 31 Jan 2008 11:25:21 +0100 - -libconfigduo (1.1.1-1) unstable; urgency=low - - * Initial release - - -- Klaus Schneider Mon, 25 Jun 2007 16:21:56 +0200 diff --git a/debian/control b/debian/control index 7c3b01d..3afc71b 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,8 @@ Source: libconfig Priority: optional -Maintainer: Klaus Schneider -Uploaders: Julien Danjou -Build-Depends: debhelper (>= 5), autotools-dev -Standards-Version: 3.8.0 +Maintainer: Jose Luis Tallon +Build-Depends: debhelper (>= 5), autotools-dev, texinfo, texlive, ghostscript, quilt +Standards-Version: 3.8.3 Homepage: http://www.hyperrealm.com/libconfig/ Section: libs @@ -39,7 +38,8 @@ Package: libconfig8-dev Section: libdevel Architecture: any Provides: libconfig-dev -Depends: libconfig8 (= ${binary:Version}), pkg-config (>= 0.20) +Depends: libconfig8 (= ${binary:Version}), pkg-config (>= 0.20), ${misc:Depends} +Conflicts: libconfig6-dev 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 @@ -62,7 +62,9 @@ Package: libconfig++8-dev Section: libdevel Architecture: any Provides: libconfig++-dev -Depends: libconfig++8 (= ${binary:Version}), libconfig8 (= ${binary:Version}), pkg-config (>= 0.20) +Depends: libconfig++8 (= ${binary:Version}), libconfig-dev, + pkg-config (>= 0.20), ${misc:Depends} +Conflicts: libconfig++6-dev 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 diff --git a/debian/copyright b/debian/copyright index 1c41e22..c8a9482 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) @@ -30,36 +30,5 @@ 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 -and is licensed under the GPL, see `/usr/share/common-licenses/GPL'. -This package was debianized by Klaus Schneider 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 and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is (C) 2006-2009, Jose Luis Tallon +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++8-dev.examples b/debian/libconfig++8-dev.examples new file mode 100644 index 0000000..b2c7675 --- /dev/null +++ b/debian/libconfig++8-dev.examples @@ -0,0 +1,2 @@ +samples/c++/*.cpp +debian/additions/sample.c++.Makefile diff --git a/debian/libconfig++8-dev.install b/debian/libconfig++8-dev.install index 52e3764..a6f027b 100644 --- a/debian/libconfig++8-dev.install +++ b/debian/libconfig++8-dev.install @@ -1,4 +1,4 @@ debian/tmp/usr/include/libconfig.h++ debian/tmp/usr/lib/libconfig++.a debian/tmp/usr/lib/libconfig++.so -libconfig++.pc usr/lib/pkgconfig +libconfig++.pc usr/lib/pkgconfig diff --git a/debian/libconfig8-dev.doc-base b/debian/libconfig8-dev.doc-base new file mode 100644 index 0000000..a5eca56 --- /dev/null +++ b/debian/libconfig8-dev.doc-base @@ -0,0 +1,9 @@ +Document: libconfig8 +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/libconfig8-dev/libconfig.pdf.gz diff --git a/debian/libconfig8-dev.examples b/debian/libconfig8-dev.examples new file mode 100644 index 0000000..306ccd5 --- /dev/null +++ b/debian/libconfig8-dev.examples @@ -0,0 +1,2 @@ +samples/c/*.c +debian/additions/sample.c.Makefile \ No newline at end of file diff --git a/debian/libconfig8-dev.info b/debian/libconfig8-dev.info new file mode 100644 index 0000000..628d7f3 --- /dev/null +++ b/debian/libconfig8-dev.info @@ -0,0 +1 @@ +debian/tmp/usr/share/info/libconfig.info diff --git a/debian/libconfig8-dev.install b/debian/libconfig8-dev.install index 6393be1..ede86d5 100644 --- a/debian/libconfig8-dev.install +++ b/debian/libconfig8-dev.install @@ -1,4 +1,4 @@ debian/tmp/usr/include/libconfig.h debian/tmp/usr/lib/libconfig.a debian/tmp/usr/lib/libconfig.so -libconfig.pc usr/lib/pkgconfig +libconfig.pc usr/lib/pkgconfig diff --git a/debian/libconfig8.install b/debian/libconfig8.install index ff402ce..8a5d847 100644 --- a/debian/libconfig8.install +++ b/debian/libconfig8.install @@ -1,2 +1 @@ debian/tmp/usr/lib/libconfig.so.8* -debian/tmp/usr/lib/libconfig.la diff --git a/debian/rules b/debian/rules index 2331b8f..931fe85 100755 --- a/debian/rules +++ b/debian/rules @@ -9,12 +9,14 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +LIBS = $(shell grep '^Package: lib' debian/control | egrep -v '(-doc|-dev)' | sed -e 's@Package: @@' ) # 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) +include /usr/share/quilt/quilt.make CFLAGS = -Wall -g @@ -25,13 +27,10 @@ else 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)}'` +version=8 +major=8 +minor=0 + config.status: configure dh_testdir @@ -39,13 +38,15 @@ config.status: configure 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" +configure: patch + $(RM) debian/libconfig8.info debian/shlibs build: build-stamp build-stamp: config.status @@ -54,9 +55,10 @@ build-stamp: config.status # Add here commands to compile the package. $(MAKE) + $(MAKE) -C doc pdf touch $@ -clean: +clean: unpatch dh_testdir dh_testroot @@ -64,7 +66,7 @@ clean: rm -f build-stamp - $(RM) config.guess config.sub + $(RM) config.guess config.sub config.log dh_clean install: build @@ -75,7 +77,7 @@ install: build # Add here commands to install the package into debian/tmp $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - + $(RM) .libs/*.la # Build architecture-independent files here. binary-indep: build install @@ -97,116 +99,12 @@ binary-arch: build install 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)}'` - -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. + @for f in $(LIBS); do \ + echo "makeshlibs -p$$f" ; \ + dh_makeshlibs -p$$f ; \ + done -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installexamples - dh_install -# 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 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) -- cgit v1.2.3