[pkg-boost-commits] r14218 - boost/trunk/debian
smr at alioth.debian.org
smr at alioth.debian.org
Mon May 5 03:48:24 UTC 2008
Author: smr
Date: 2008-05-05 03:48:23 +0000 (Mon, 05 May 2008)
New Revision: 14218
Removed:
boost/trunk/debian/libboost-dbg.lintian-overrides
boost/trunk/debian/libboost-dev.lintian-overrides
boost/trunk/debian/libboost-doc.lintian-overrides
boost/trunk/debian/libboost-python-dev.lintian-overrides
Modified:
boost/trunk/debian/changelog
boost/trunk/debian/control
boost/trunk/debian/rules
Log:
Create all lintian-overrides dynamically. Use dh_lintian to install.
Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog 2008-05-04 22:27:55 UTC (rev 14217)
+++ boost/trunk/debian/changelog 2008-05-05 03:48:23 UTC (rev 14218)
@@ -37,7 +37,16 @@
* debian/control: Remove package bcp1.35.
* debian/rules: Package /usr/bin/bcp and its manpage in libboost1.35-dev.
- -- Steve M. Robbins <smr at debian.org> Sun, 04 May 2008 11:06:39 -0500
+ * debian/control: Build-depend on debhelper (>= 6.0.7) to ensure
+ dh_lintian available.
+ * debian/rules: Use dh_lintian to install lintian-overrides. Create all
+ lintian-overrides files in debian/rules.
+ * debian/libboost-dev.lintian-overrides:
+ * debian/libboost-dbg.lintian-overrides:
+ * debian/libboost-python-dev.lintian-overrides:
+ * debian/libboost-doc.lintian-overrides: Delete.
+
+ -- Steve M. Robbins <smr at debian.org> Sun, 04 May 2008 22:47:54 -0500
boost (1.34.1-11) unstable; urgency=low
Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control 2008-05-04 22:27:55 UTC (rev 14217)
+++ boost/trunk/debian/control 2008-05-05 03:48:23 UTC (rev 14218)
@@ -4,7 +4,7 @@
Priority: optional
Maintainer: Debian Boost Team <pkg-boost-devel at lists.alioth.debian.org>
Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>, Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 4), quilt, bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6)
+Build-Depends: debhelper (>= 6.0.7), quilt, bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6)
XS-Python-Version: 2.4, 2.5
Standards-Version: 3.7.3
Deleted: boost/trunk/debian/libboost-dbg.lintian-overrides
===================================================================
--- boost/trunk/debian/libboost-dbg.lintian-overrides 2008-05-04 22:27:55 UTC (rev 14217)
+++ boost/trunk/debian/libboost-dbg.lintian-overrides 2008-05-05 03:48:23 UTC (rev 14218)
@@ -1,2 +0,0 @@
-libboost-dbg: package-name-doesnt-match-sonames
-libboost-dbg: non-dev-pkg-with-shlib-symlink
Deleted: boost/trunk/debian/libboost-dev.lintian-overrides
===================================================================
--- boost/trunk/debian/libboost-dev.lintian-overrides 2008-05-04 22:27:55 UTC (rev 14217)
+++ boost/trunk/debian/libboost-dev.lintian-overrides 2008-05-05 03:48:23 UTC (rev 14218)
@@ -1 +0,0 @@
-libboost-dev: description-synopsis-starts-with-a-capital-letter
Deleted: boost/trunk/debian/libboost-doc.lintian-overrides
===================================================================
--- boost/trunk/debian/libboost-doc.lintian-overrides 2008-05-04 22:27:55 UTC (rev 14217)
+++ boost/trunk/debian/libboost-doc.lintian-overrides 2008-05-05 03:48:23 UTC (rev 14218)
@@ -1,2 +0,0 @@
-libboost-doc: description-synopsis-starts-with-a-capital-letter
-libboost-doc: extra-license-file usr/share/doc/libboost-doc/HTML/tools/boostbook/xsl/caramel/LICENSE
Deleted: boost/trunk/debian/libboost-python-dev.lintian-overrides
===================================================================
--- boost/trunk/debian/libboost-python-dev.lintian-overrides 2008-05-04 22:27:55 UTC (rev 14217)
+++ boost/trunk/debian/libboost-python-dev.lintian-overrides 2008-05-05 03:48:23 UTC (rev 14218)
@@ -1 +0,0 @@
-libboost-python-dev: description-synopsis-starts-with-a-capital-letter
Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules 2008-05-04 22:27:55 UTC (rev 14217)
+++ boost/trunk/debian/rules 2008-05-05 03:48:23 UTC (rev 14218)
@@ -64,7 +64,6 @@
# Return: prefix to debhelper filenames
mk_deb_lib = debian/$(call mk_pkg_lib,$(1),$(2))
mk_deb_dev = debian/$(call mk_pkg_dev,$(1),$(2))
-mk_ove_lib = $(call mk_deb_lib,$(1),$(2))/usr/share/lintian/overrides/$(call mk_pkg_lib,$(1),$(2))
# Helpers that update debhelper .install or .links files
# Input: component, library, variant, suffix
@@ -81,16 +80,33 @@
mk_files = $(foreach fn,a so ln ln2 ln3,$(call mk_$(fn)_files,$(1),$(2),$(3),$(4)))
# helpers to make and install lintian override files
-mk_override_files = echo $(call mk_pkg_lib,$(1)): package-name-doesnt-match-sonames >> $(call mk_ove_lib,$(1));
-ins_lintian_overrides = install -m644 debian/$(1).lintian-overrides debian/$(2)/usr/share/lintian/overrides/$(2);
+
+# Input: package, override
+add_override = echo $(1): $(2) >> debian/$(1).lintian-overrides;
+
+# Input: override
+add_dbg_override = $(call add_override,libboost$(PKGVERSION)-dbg,$(1))
+add_dev_override = $(call add_override,libboost$(PKGVERSION)-dev,$(1))
+add_doc_override = $(call add_override,libboost$(PKGVERSION)-doc,$(1))
+
+# Input: component, variant, lintian-warning
+add_lib_override = $(call add_override,$(call mk_pkg_lib,$(1),$(2)),$(3))
+add_libdev_override = $(call add_override,$(call mk_pkg_dev,$(1),$(2)),$(3))
+
cp_debhelper = for s in doc-base examples postinst prerm README.Debian; do \
if test -f debian/$(1).$$s; then cp -f debian/$(1).$$s debian/$(2).$$s; fi; done
# Function that updates debhelper files for all library variants shipped.
mk_debhelper_files = \
+ $(call add_dbg_override,package-name-doesnt-match-sonames) \
+ $(call add_dbg_override,non-dev-pkg-with-shlib-symlink) \
+ $(call add_dev_override,description-synopsis-starts-with-a-capital-letter) \
+ $(call add_doc_override,description-synopsis-starts-with-a-capital-letter) \
+ $(call add_doc_override,extra-license-file) \
+ $(call add_libdev_override,python,,description-synopsis-starts-with-a-capital-letter) \
$(foreach l, $(boost_libs), \
echo "making debhelper files for $(l)..."; \
- $(call mk_override_files,$(l)) \
+ $(call add_lib_override,$(1),,package-name-doesnt-match-sonames) \
$(foreach ll, $(call boost_lib,$(l)), \
$(foreach v, $(call boost_variants,$(l)), \
$(foreach suf, $(call boost_suffixes,$(l)), \
@@ -139,13 +155,9 @@
touch build-stamp
clean-debhelper:
- rm -rf debian/libboost-*$(SOVERSION).lintian-overrides
- rm -rf debian/libboost-*$(SOVERSION).install
- rm -rf debian/libboost-*$(PKGVERSION)-dev.install
- rm -rf debian/libboost-*$(PKGVERSION)-dev.links
- rm -rf debian/libboost-*$(SOVERSION).links
- rm -rf debian/libboost$(PKGVERSION)-dbg.install
- rm -rf debian/libboost$(PKGVERSION)-dbg.links
+ rm -rf debian/*.install
+ rm -rf debian/*.links
+ rm -rf debian/*.lintian-overrides
clean: unpatch clean-debhelper
dh_testdir
@@ -165,6 +177,10 @@
dh_clean build-stamp
+# This rule is for debugging debian/rules.
+make-debhelper: clean-debhelper
+ @$(call mk_debhelper_files)
+
install: DH_OPTIONS=-X.svn
install: build clean-debhelper
dh_testdir
@@ -188,8 +204,6 @@
find debian/tmp -name .cvsignore | xargs rm -f
find debian -empty -type f | xargs rm -f
- dh_installdirs -A usr/share/lintian/overrides
-
# generate (some) debhelper files
@$(call mk_debhelper_files)
@@ -205,7 +219,6 @@
dh_link -plibboost$(PKGVERSION)-dbg \
usr/lib/libboost_thread-mt-d.a usr/lib/libboost_thread-d.a \
usr/lib/libboost_thread-mt-d.so usr/lib/libboost_thread-d.so
- $(call ins_lintian_overrides,libboost-dbg,libboost$(PKGVERSION)-dbg)
# package libboost$(PKGVERSION)-dev
dh_install -plibboost$(PKGVERSION)-dev \
@@ -213,7 +226,6 @@
usr/include
dh_install -plibboost$(PKGVERSION)-dev dist/bin/bcp usr/bin
dh_installman -plibboost$(PKGVERSION)-dev debian/bcp.1
- $(call ins_lintian_overrides,libboost-dev,libboost$(PKGVERSION)-dev)
# package libboost-doc
rm -rf $(htmldir)
@@ -228,7 +240,6 @@
mkdir -p $(exampledir)
cat debian/example-files | xargs cp -a --parents --target-directory=$(exampledir)
find $(exampledir) -type f | xargs chmod 644
- $(call ins_lintian_overrides,libboost-doc,libboost$(PKGVERSION)-doc)
# package libboost-date-time$(SOVERSION)
@@ -285,7 +296,6 @@
dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
dh_link -plibboost-python$(PKGVERSION)-dev
- $(call ins_lintian_overrides,libboost-python-dev,libboost-python$(PKGVERSION)-dev)
# package libboost-regex$(SOVERSION)
dh_install -plibboost-regex$(SOVERSION)
@@ -363,6 +373,7 @@
dh_installexamples
dh_installinfo
dh_installchangelogs
+ dh_lintian
dh_strip -Nlibboost-dbg
dh_link
dh_compress -Xlibboost$(PKGVERSION)-doc/HTML
More information about the pkg-boost-commits
mailing list