From a9e0dc809a9e363f57678dde3f0ae97a22d1cfb8 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Sat, 4 May 2013 17:10:38 +0100 Subject: debian: Add shared library --- debian/changelog | 8 +++++++ debian/control | 50 ++++++++++++++++++++++++++------------- debian/libsbuild-1.7.0.install.in | 1 + debian/libsbuild-dev.install.in | 2 +- debian/rules | 7 +++--- 5 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 debian/libsbuild-1.7.0.install.in (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a0f1840f..c06c81d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,14 @@ schroot (1.7.0-1) UNRELEASED; urgency=low been re-added to support unsharing network devices. These are regular setup scripts, called with an exec-start or exec-start argument. + * libsbuild-1.7.0: + - New package + - Introduce a shared library. + * libsbuild-1.7.0-dev: + - New package. + - Shared library debugging symbols. + * libsbuild-dev: + - Remove static library, and include shared library symlink. * debian/copyright: Update to use DEP-5 copyright format v1.0. * debian/control: Remove liblockdev and libuuid from Build-Depends. * debian/rules: diff --git a/debian/control b/debian/control index b8811a4f..2d3d9246 100644 --- a/debian/control +++ b/debian/control @@ -39,17 +39,38 @@ Description: common files for schroot This package provides translations for localisation of schroot programs. +Package: libsbuild-1.7.0 +Architecture: any +Section: libs +Depends: + ${misc:Depends} +Suggests: libsbuild-1.7.0-dbg +Description: shared library for the Debian source builder + libsbuild provides facilities to manage and access chroots, as part of + schroot. + . + schroot allows users to execute commands or interactive shells in + different chroots. Any number of named chroots may be created, and + access permissions given to each, including root access for normal + users, on a per-user or per-group basis. Additionally, schroot can + switch to a different user in the chroot, using PAM for + authentication and authorisation. All operations are logged for + security. + . + This package contains the shared library. + Package: libsbuild-dev Architecture: any Section: libdevel Depends: ${misc:Depends}, + libsbuild-1.7.0 (= ${binary:Version}), pkg-config (>= 0.14.0) Suggests: - schroot-dbg, + libsbuild-1.7.0-dbg, libsbuild-doc Description: development files for the Debian source builder - sbuild provides facilities to manage and access chroots, as part of + libsbuild provides facilities to manage and access chroots, as part of schroot. . schroot allows users to execute commands or interactive shells in @@ -60,23 +81,20 @@ Description: development files for the Debian source builder authentication and authorisation. All operations are logged for security. . - This package contains the header files and static library needed to - develop applications which make use of sbuild. Once the API and ABI - are stable, a shared library will replace the static library. + This package contains the header files needed to develop applications + which make use of sbuild. -Package: schroot-dbg +Package: libsbuild-1.7.0-dbg Architecture: any Section: debug Priority: extra Depends: ${misc:Depends}, - schroot (= ${binary:Version}) | dchroot (= ${binary:Version}) | dchroot-dsa (= ${binary:Version}) + libsbuild-1.7.0 (= ${binary:Version}), Conflicts: - schroot (<< ${binary:Version}), schroot (>> ${binary:Version}), - dchroot (<< ${binary:Version}), dchroot (>>${binary:Version}), - dchroot-dsa (<< ${binary:Version}), dchroot-dsa (>>${binary:Version}) -Description: schroot, dchroot and dchroot-dsa debugging symbols - sbuild provides facilities to manage and access chroots, as part of + schroot-dbg +Description: Debugging symbols for the Debian source builder + libsbuild provides facilities to manage and access chroots, as part of schroot. . schroot allows users to execute commands or interactive shells in @@ -87,8 +105,8 @@ Description: schroot, dchroot and dchroot-dsa debugging symbols authentication and authorisation. All operations are logged for security. . - This package contains debugging symbols for the schroot, dchroot - and dchroot-dsa packages. + This package contains debugging symbols for the libsbuild package, + and dependent packages including schroot, dchroot and dchroot-dsa. Package: libsbuild-doc Architecture: all @@ -96,7 +114,7 @@ Section: doc Depends: ${misc:Depends} Suggests: libsbuild-dev Description: development documentation for the Debian source builder - sbuild provides facilities to manage and access chroots, as part of + libsbuild provides facilities to manage and access chroots, as part of schroot. . schroot allows users to execute commands or interactive shells in @@ -108,7 +126,7 @@ Description: development documentation for the Debian source builder security. . This package contains the API documentation needed to develop - applications which make use of sbuild. + applications which make use of libsbuild. Package: schroot Architecture: any diff --git a/debian/libsbuild-1.7.0.install.in b/debian/libsbuild-1.7.0.install.in new file mode 100644 index 00000000..7faa9113 --- /dev/null +++ b/debian/libsbuild-1.7.0.install.in @@ -0,0 +1 @@ +debian/install/@LIBDIR@/libsbuild-*.so @LIBDIR@ diff --git a/debian/libsbuild-dev.install.in b/debian/libsbuild-dev.install.in index 9815eca0..f5d646ed 100644 --- a/debian/libsbuild-dev.install.in +++ b/debian/libsbuild-dev.install.in @@ -1,3 +1,3 @@ debian/install/usr/include usr -debian/install/@LIBDIR@/libsbuild.a @LIBDIR@ +debian/install/@LIBDIR@/libsbuild.so @LIBDIR@ debian/install/@LIBDIR@/pkgconfig @LIBDIR@ diff --git a/debian/rules b/debian/rules index cec50f66..3330230d 100755 --- a/debian/rules +++ b/debian/rules @@ -44,7 +44,6 @@ override_dh_auto_configure: debian/build/config.status debian/build/config.status: configure dh_auto_configure -- \ --enable-dchroot --enable-dchroot-dsa \ - --enable-static --disable-shared \ --with-bash-completion-dir=/etc/bash_completion.d \ $(LVMSNAP_OPTIONS) $(BTRFSSNAP_OPTIONS) \ BTRFS=/sbin/btrfs \ @@ -61,10 +60,10 @@ override_dh_auto_clean: override_dh_auto_build: ifneq (,$(shell dh_listpackages -a 2>/dev/null)) - $(MAKE) -C debian/build all PO4A= + $(MAKE) -C debian/build all V=1 PO4A= endif ifneq (,$(shell dh_listpackages -i 2>/dev/null)) - $(MAKE) -C debian/build doc PO4A= + $(MAKE) -C debian/build doc V=1 PO4A= endif override_dh_auto_test: @@ -114,6 +113,6 @@ override_dh_installinit: dh_installinit --no-start --update-rcd-params='defaults' override_dh_strip: - dh_strip --dbg-package=schroot-dbg + dh_strip --dbg-package=libsbuild-1.7.0-dbg .PHONY: override_dh_auto_configure override_dh_auto_clean override_dh_auto_build override_dh_auto_test override_dh_auto_install override_dh_installchangelogs override_dh_installinit override_dh_strip install-arch install-indep -- cgit v1.2.3