From 1e469427836c211ae7c50cb84182338c55b2302f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Sun, 18 Nov 2007 23:53:07 +0000 Subject: [PATCH] * create .pc file, seems to be a good thing to do. * debian packaging added. --- libcitadel/Makefile.in | 20 +++- libcitadel/configure.in | 2 +- libcitadel/debian/changelog | 6 ++ libcitadel/debian/control | 32 +++++++ libcitadel/debian/files | 3 + libcitadel/debian/libcitadel-dbg.install | 1 + libcitadel/debian/libcitadel-dev.dirs | 1 + libcitadel/debian/libcitadel-dev.install | 3 + libcitadel/debian/libcitadel1.install | 1 + .../debian/libcitadel1.postinst.debhelper | 5 + .../debian/libcitadel1.postrm.debhelper | 5 + libcitadel/debian/libcitadel1.substvars | 1 + libcitadel/debian/rules | 94 +++++++++++++++++++ libcitadel/libcitadel.pc.in | 14 +++ 14 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 libcitadel/debian/changelog create mode 100644 libcitadel/debian/control create mode 100644 libcitadel/debian/files create mode 100644 libcitadel/debian/libcitadel-dbg.install create mode 100644 libcitadel/debian/libcitadel-dev.dirs create mode 100644 libcitadel/debian/libcitadel-dev.install create mode 100644 libcitadel/debian/libcitadel1.install create mode 100644 libcitadel/debian/libcitadel1.postinst.debhelper create mode 100644 libcitadel/debian/libcitadel1.postrm.debhelper create mode 100644 libcitadel/debian/libcitadel1.substvars create mode 100755 libcitadel/debian/rules create mode 100644 libcitadel/libcitadel.pc.in diff --git a/libcitadel/Makefile.in b/libcitadel/Makefile.in index 86a31da05..4c619e3b6 100755 --- a/libcitadel/Makefile.in +++ b/libcitadel/Makefile.in @@ -21,7 +21,8 @@ man1dir = @mandir@/man1 datarootdir = @datarootdir@ top_builddir = . - +pkgconfig_DATA = libcitadel.pc +pkgconfigdir = $(libdir)/pkgconfig INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -39,6 +40,21 @@ buildlib: $(LIBRARY) all: $(LIBRARY) +libcitadel.pc: $(top_builddir)/config.status libcitadel.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ + +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ + $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \ + done + + clean: cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs rm -rf .libs libcitadel.la @@ -49,7 +65,7 @@ distclean: clean rm -f config.status config.log config.cache libtool rm -f Makefile -install: $(LIBRARY) $(APIHEADER) +install: $(LIBRARY) $(APIHEADER) install-pkgconfigDATA $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY) for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done diff --git a/libcitadel/configure.in b/libcitadel/configure.in index f700b3cfc..73f2193d8 100755 --- a/libcitadel/configure.in +++ b/libcitadel/configure.in @@ -63,7 +63,7 @@ AC_C_CONST AC_TYPE_SIZE_T AC_CHECK_FUNCS(memmove bcopy) -AC_CONFIG_FILES(Makefile) +AC_CONFIG_FILES(Makefile libcitadel.pc) AC_OUTPUT abs_srcdir="`cd $srcdir && pwd`" diff --git a/libcitadel/debian/changelog b/libcitadel/debian/changelog new file mode 100644 index 000000000..8bd4c5eb0 --- /dev/null +++ b/libcitadel/debian/changelog @@ -0,0 +1,6 @@ +libcitadel (7.24-1) unstable; urgency=low + + * initial debian release + + -- Wilfried Goesgens Sun, 18 Nov 2007 23:55:21 +0100 + \ No newline at end of file diff --git a/libcitadel/debian/control b/libcitadel/debian/control new file mode 100644 index 000000000..e532fa2fa --- /dev/null +++ b/libcitadel/debian/control @@ -0,0 +1,32 @@ +Source: libcitadel +Section: libs +Priority: optional +Maintainer: Citadel Team +Uploaders: Wilfried Goesgens , Alexander Wirt +Build-Depends: debhelper (>= 5) +Standards-Version: 3.7.2 + +Package: libcitadel1 +Architecture: any +Depends: ${shlibs:Depends} +Description: Citadel toolbox + This library contains the commonly used routines for the citadel suite. + +Package: libcitadel1-dbg +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, libcitadel1 (= ${Source-Version}) +Description: Debugging symbols for libcitadel1 + This library contains the commonly used routines for the citadel suite. + . + This package provides the debugging symbols. + +Package: libcitadel-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, pkg-config, + libcitadel1 (= ${Source-Version}) +Description: Development files for libcitadel1 + This library contains the commonly used routines for the citadel suite. + . + This package provides development files and static libraries. diff --git a/libcitadel/debian/files b/libcitadel/debian/files new file mode 100644 index 000000000..efb3739e3 --- /dev/null +++ b/libcitadel/debian/files @@ -0,0 +1,3 @@ +libcitadel1_7.24-1_i386.deb libs optional +libcitadel1-dbg_7.24-1_i386.deb libdevel optional +libcitadel-dev_7.24-1_i386.deb libdevel optional diff --git a/libcitadel/debian/libcitadel-dbg.install b/libcitadel/debian/libcitadel-dbg.install new file mode 100644 index 000000000..7276ecdef --- /dev/null +++ b/libcitadel/debian/libcitadel-dbg.install @@ -0,0 +1 @@ +usr/share/doc diff --git a/libcitadel/debian/libcitadel-dev.dirs b/libcitadel/debian/libcitadel-dev.dirs new file mode 100644 index 000000000..7276ecdef --- /dev/null +++ b/libcitadel/debian/libcitadel-dev.dirs @@ -0,0 +1 @@ +usr/share/doc diff --git a/libcitadel/debian/libcitadel-dev.install b/libcitadel/debian/libcitadel-dev.install new file mode 100644 index 000000000..062126586 --- /dev/null +++ b/libcitadel/debian/libcitadel-dev.install @@ -0,0 +1,3 @@ +usr/lib/pkgconfig +usr/lib/*.{so,a} +usr/include diff --git a/libcitadel/debian/libcitadel1.install b/libcitadel/debian/libcitadel1.install new file mode 100644 index 000000000..093956b17 --- /dev/null +++ b/libcitadel/debian/libcitadel1.install @@ -0,0 +1 @@ +usr/lib/*.so.* diff --git a/libcitadel/debian/libcitadel1.postinst.debhelper b/libcitadel/debian/libcitadel1.postinst.debhelper new file mode 100644 index 000000000..3d89d3ef6 --- /dev/null +++ b/libcitadel/debian/libcitadel1.postinst.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "configure" ]; then + ldconfig +fi +# End automatically added section diff --git a/libcitadel/debian/libcitadel1.postrm.debhelper b/libcitadel/debian/libcitadel1.postrm.debhelper new file mode 100644 index 000000000..7f4404727 --- /dev/null +++ b/libcitadel/debian/libcitadel1.postrm.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_makeshlibs +if [ "$1" = "remove" ]; then + ldconfig +fi +# End automatically added section diff --git a/libcitadel/debian/libcitadel1.substvars b/libcitadel/debian/libcitadel1.substvars new file mode 100644 index 000000000..e881fc18f --- /dev/null +++ b/libcitadel/debian/libcitadel1.substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.6.1-1) diff --git a/libcitadel/debian/rules b/libcitadel/debian/rules new file mode 100755 index 000000000..41c813463 --- /dev/null +++ b/libcitadel/debian/rules @@ -0,0 +1,94 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_COMPAT = 5 + +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 -fno-strict-aliasing +endif + +build: build-stamp +build-stamp: + dh_testdir + +# ./configure + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr + +# Build libcitadel + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp install*-stamp + + -$(MAKE) distclean + + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=`pwd`/debian/tmp install + + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdocs -i -A README + dh_installchangelogs -i debian/no-upstream-changelog + dh_install -i --sourcedir=debian/tmp + dh_link -i + dh_strip -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir -a + dh_testroot -a +# dh_installdocs -plibnetfilter-log1 +# ln -sf libnetfilter-log1 debian/libnetfilter-log1-dbg/usr/share/doc/libnetfilter-log1-dbg +# ln -sf libnetfilter-log1 debian/libnetfilter-log-dev/usr/share/doc/libnetfilter-log-dev +# dh_installchangelogs -plibnetfilter-log1 + dh_install -a --sourcedir=debian/tmp + dh_link -a +# dh_strip -a --dbg-package=libnetfilter-log1-dbg + dh_compress -a + dh_fixperms -a +# dh_makeshlibs -a -V 'libnetfilter-log1 (>= 0.0.13)' + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/libcitadel/libcitadel.pc.in b/libcitadel/libcitadel.pc.in new file mode 100644 index 000000000..3227caf1d --- /dev/null +++ b/libcitadel/libcitadel.pc.in @@ -0,0 +1,14 @@ +# libcitadel pkg-config file + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libcitadel +Description: citadel suite tools library +URL: http://www.citadel.org/ +Version: @VERSION@ +Conflicts: +Libs: -L${libdir} -lcitadel +Cflags: -I${includedir} -- 2.30.2