[Pkg-gnutls-commits] r1877 - in /packages/gnutls28/trunk/debian: changelog control gnutls-doc.dirs libgnutls28.docs rules
ametzler at users.alioth.debian.org
ametzler at users.alioth.debian.org
Sat Aug 24 06:51:56 UTC 2013
Author: ametzler
Date: Sat Aug 24 06:51:54 2013
New Revision: 1877
URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1877
Log:
Switch to dh, to easily allow us to move gtk-doc-tools to
Build-Depends-Indep.
Added:
packages/gnutls28/trunk/debian/gnutls-doc.dirs
packages/gnutls28/trunk/debian/libgnutls28.docs
Modified:
packages/gnutls28/trunk/debian/changelog
packages/gnutls28/trunk/debian/control
packages/gnutls28/trunk/debian/rules
Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1877&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Aug 24 06:51:54 2013
@@ -1,6 +1,8 @@
gnutls28 (3.2.3-3) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Switch to dh, to easily allow us to move gtk-doc-tools to
+ Build-Depends-Indep.
-- Andreas Metzler <ametzler at debian.org> Sun, 04 Aug 2013 14:09:53 +0200
Modified: packages/gnutls28/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/control?rev=1877&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/control (original)
+++ packages/gnutls28/trunk/debian/control Sat Aug 24 06:51:54 2013
@@ -7,10 +7,10 @@
James Westby <jw+debian at jameswestby.net>,
Simon Josefsson <simon at josefsson.org>
Build-Depends: debhelper (>= 9), nettle-dev (>= 2.7), zlib1g-dev,
- cdbs (>= 0.4.93), gtk-doc-tools, texinfo (>= 4.8),
libtasn1-6-dev (>= 3.1), autotools-dev, guile-2.0-dev [!ia64], datefudge,
libp11-kit-dev (>= 0.11), pkg-config, chrpath, libidn11-dev,
autogen (>= 1:5.16-0)
+Build-Depends-Indep: gtk-doc-tools, texinfo (>= 4.8)
Build-Conflicts: libgnutls-dev
Standards-Version: 3.9.4
Vcs-Svn: svn://anonscm.debian.org/pkg-gnutls/packages/gnutls28/trunk
Added: packages/gnutls28/trunk/debian/gnutls-doc.dirs
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/gnutls-doc.dirs?rev=1877&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/gnutls-doc.dirs (added)
+++ packages/gnutls28/trunk/debian/gnutls-doc.dirs Sat Aug 24 06:51:54 2013
@@ -0,0 +1 @@
+/usr/share/info
Added: packages/gnutls28/trunk/debian/libgnutls28.docs
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/libgnutls28.docs?rev=1877&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/libgnutls28.docs (added)
+++ packages/gnutls28/trunk/debian/libgnutls28.docs Sat Aug 24 06:51:54 2013
@@ -0,0 +1,4 @@
+AUTHORS
+NEWS
+README
+THANKS
Modified: packages/gnutls28/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/rules?rev=1877&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/rules (original)
+++ packages/gnutls28/trunk/debian/rules Sat Aug 24 06:51:54 2013
@@ -1,49 +1,45 @@
#! /usr/bin/make -f
# Build the gnutls package for Debian.
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+export DEB_CFLAGS_MAINT_APPEND := -Wall
+export DEB_CXXFLAGS_MAINT_APPEND := -Wall
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx \
- --without-lzo --enable-gtk-doc \
+AMCONFBUILDINDEP := $(shell if dh_listpackages | grep -q gnutls-doc ; \
+ then echo "--enable-gtk-doc" ; else echo "--disable-gtk-doc"; fi)
+AMCONFBUILDGUILE := $(shell if dh_listpackages | grep -q guile-gnutls ; \
+ then \
+ echo " --enable-guile --with-guile-site-dir=/usr/share/guile/site" ;\
+ else echo " --disable-guile" ; fi)
+
+override_dh_auto_configure:
+ dh_auto_configure --verbose -- \
+ --enable-ld-version-script --enable-cxx \
+ --without-lzo \
--disable-libdane --without-tpm \
--disable-heartbeat-support \
+ -disable-silent-rules \
--with-packager=Debian \
--with-packager-bug-reports=http://bugs.debian.org/ \
- --with-packager-version="$(DEB_VERSION)" \
- --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
-DEB_MAKE_CHECK_TARGET = check
-DEB_DH_MAKESHLIBS_ARGS_libgnutls28 := -V 'libgnutls28 (>= 3.2.3-0)'
-DEB_DH_MAKESHLIBS_ARGS_libgnutlsxx28 := -V 'libgnutlsxx28 (>= 3.2.3-0)'
-DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -Xguile/2.0/guile-gnutls-v-2.so
-DEB_COMPRESS_EXCLUDE := gnutls.pdf
+ --with-packager-version=$(shell dpkg-parsechangelog | sed -n '/^Version: /s/^Version: //p') \
+ $(AMCONFBUILDINDEP) \
+ $(AMCONFBUILDGUILE)
-# Guile 2.0 does not build here.
-ifeq (,$(filter $(DEB_BUILD_ARCH),ia64))
- DEB_CONFIGURE_EXTRA_FLAGS += --enable-guile --with-guile-site-dir=/usr/share/guile/site
-else
- DEB_CONFIGURE_EXTRA_FLAGS += --disable-guile
-endif
+override_dh_makeshlibs:
+ dh_makeshlibs -p libgnutlsxx28 -V 'libgnutlsxx28 (>= 3.2.3-0)'
+ dh_makeshlibs -p libgnutls28 -V 'libgnutls28 (>= 3.2.3-0)'
+ dh_makeshlibs --remaining-packages -Xguile/2.0/guile-gnutls-v-2.so
# pre-clean rule: save gnutls.pdf since it is expensive to regenerate.
# See README.source
-cleanbuilddir/gnutls-doc::
- if [ -e doc/gnutls.pdf ] ; then mv doc/gnutls.pdf doc/gnutls.pdf.debbackup ; fi
-
-
-# additional commands for clean
-clean::
- mkdir -p m4
-
- -rm -rf autom4te.cache config.log
-
- -rm -f tests/stamp-tests
- # stupid conflicts
- -rm -f doc/*.info* lib/po/libgnutls28.pot
+override_dh_auto_clean:
+ if [ -e doc/gnutls.pdf ] ; then \
+ mv -v doc/gnutls.pdf doc/gnutls.pdf.debbackup ; fi
+ dh_auto_clean --verbose
# restore gnutls.pdf
- if [ -e doc/gnutls.pdf.debbackup ] && [ ! -e doc/gnutls.pdf ] ; then mv doc/gnutls.pdf.debbackup doc/gnutls.pdf ; fi
+ if [ -e doc/gnutls.pdf.debbackup ] && [ ! -e doc/gnutls.pdf ] ; \
+ then mv -v doc/gnutls.pdf.debbackup doc/gnutls.pdf ; fi
# force regeneration of autogen-ed files.
for i in `grep -l AutoGen-ed src/*.c` ; do \
t=`basename $$i .c` ;\
@@ -51,34 +47,25 @@
done
rm -fv `grep -l 'has been AutoGen-ed ' doc/manpages/*.?`
-# additional comands for build rule
-build/gnutls-doc::
+override_dh_auto_build-indep:
$(MAKE) html
-# add post deb preparation (including debhelper stuff) actions
-# generate symlinks manually and use dh_link to make them policy-conform.
-binary-install/gnutls-doc::
- cd debian/gnutls-doc && \
- for i in usr/share/doc/gnutls-doc/html/gnutls*.png ; do \
- i=`basename "$$i"` ; \
- ln -s "/usr/share/doc/gnutls-doc/html/$$i" \
- usr/share/info/ ; \
- done && \
- cd ../.. && \
- dh_link -pgnutls-doc
+override_dh_auto_install:
+ dh_auto_install --verbose
+ find debian/*/usr/lib/* -name '*.so.*.*' -type f -exec \
+ chrpath -d {} +
+ rm -vf debian/*/usr/lib/*/libgnutls-openssl*
-binary-install/libgnutlsxx28::
- rm -vrf debian/libgnutlsxx28/usr/share/doc/libgnutlsxx28
- dh_link -plibgnutlsxx28 usr/share/doc/libgnutls28 \
- usr/share/doc/libgnutlsxx28
-
-binary-install/libgnutls-xssl0::
- rm -vrf debian/libgnutls-xssl0/usr/share/doc/libgnutls-xssl0
- dh_link -plibgnutls-xssl0 usr/share/doc/libgnutls28 \
- usr/share/doc/libgnutls-xssl0
-
-# See #658110
-binary-install/guile-gnutls::
+override_dh_install:
+ dh_install
+ if test -e debian/gnutls-doc ; then \
+ cd debian/gnutls-doc && \
+ for i in usr/share/doc/gnutls-doc/html/gnutls*.png ; do \
+ i=`basename "$$i"` ; \
+ ln -s "/usr/share/doc/gnutls-doc/html/$$i" \
+ usr/share/info/ ; \
+ done ; \
+ fi
if [ "" != `ls debian/guile-gnutls/usr/lib/*/guile` ] ; then \
mv -v debian/guile-gnutls/usr/lib/*/guile debian/guile-gnutls/usr/lib \
&&\
@@ -89,7 +76,20 @@
else echo "Debian build DEBUG: no guile files found" ;\
fi
-common-install-arch::
- find debian/*/usr/lib/* -name '*.so.*.*' -type f -exec \
- chrpath -d {} +
- rm -vf debian/*/usr/lib/*/libgnutls-openssl*
+override_dh_installchangelogs:
+ dh_installchangelogs
+ rm -vrf debian/libgnutlsxx28/usr/share/doc/libgnutlsxx28
+ dh_link -plibgnutlsxx28 usr/share/doc/libgnutls28 \
+ usr/share/doc/libgnutlsxx28
+ rm -vrf debian/libgnutls-xssl0/usr/share/doc/libgnutls-xssl0
+ dh_link -plibgnutls-xssl0 usr/share/doc/libgnutls28 \
+ usr/share/doc/libgnutls-xssl0
+
+override_dh_compress:
+ dh_compress -X.pdf
+
+override_dh_strip:
+ dh_strip --dbg-package=libgnutls28-dbg
+
+%:
+ dh $@ --parallel --with autotools_dev
More information about the Pkg-gnutls-commits
mailing list