r48942 - in /desktop/unstable/yelp/debian: changelog compat control control.in libyelp-dev.install libyelp0.install rules yelp.docs
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Fri May 27 13:56:56 UTC 2016
Author: jbicha-guest
Date: Fri May 27 13:56:56 2016
New Revision: 48942
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48942
Log:
* Convert from cdbs to dh
* Bump dh compat to 9
* Convert to multiarch
* Enable all hardening flags
* Add debian/docs to explicitly include NEWS and README
* Re-enable building gtk-doc since bug 803104 was fixed in webkit2gtk
Added:
desktop/unstable/yelp/debian/yelp.docs
Modified:
desktop/unstable/yelp/debian/changelog
desktop/unstable/yelp/debian/compat
desktop/unstable/yelp/debian/control
desktop/unstable/yelp/debian/control.in
desktop/unstable/yelp/debian/libyelp-dev.install
desktop/unstable/yelp/debian/libyelp0.install
desktop/unstable/yelp/debian/rules
Modified: desktop/unstable/yelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/changelog?rev=48942&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/changelog [utf-8] (original)
+++ desktop/unstable/yelp/debian/changelog [utf-8] Fri May 27 13:56:56 2016
@@ -1,3 +1,15 @@
+yelp (3.20.1-2) UNRELEASED; urgency=medium
+
+ * Team upload
+ * Convert from cdbs to dh
+ * Bump dh compat to 9
+ * Convert to multiarch
+ * Enable all hardening flags
+ * Add debian/docs to explicitly include NEWS and README
+ * Re-enable building gtk-doc since bug 803104 was fixed in webkit2gtk
+
+ -- Jeremy Bicha <jbicha at linux.com> Thu, 26 May 2016 20:54:50 -0400
+
yelp (3.20.1-1) unstable; urgency=medium
* New upstream release.
Modified: desktop/unstable/yelp/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/compat?rev=48942&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/compat [utf-8] (original)
+++ desktop/unstable/yelp/debian/compat [utf-8] Fri May 27 13:56:56 2016
@@ -1 +1 @@
-8
+9
Modified: desktop/unstable/yelp/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/control?rev=48942&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/control [utf-8] (original)
+++ desktop/unstable/yelp/debian/control [utf-8] Fri May 27 13:56:56 2016
@@ -8,10 +8,9 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
dh-autoreconf,
gnome-pkg-tools (>= 0.10),
- cdbs (>= 0.4.41),
docbook-to-man,
intltool (>= 0.41.0),
itstool (>= 1.2.0),
@@ -49,7 +48,9 @@
Package: libyelp0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library for the GNOME help browser
@@ -62,6 +63,7 @@
Package: libyelp-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
libyelp0 (= ${binary:Version}),
libgtk-3-dev,
Modified: desktop/unstable/yelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/control.in?rev=48942&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/control.in [utf-8] (original)
+++ desktop/unstable/yelp/debian/control.in [utf-8] Fri May 27 13:56:56 2016
@@ -4,10 +4,9 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
dh-autoreconf,
gnome-pkg-tools (>= 0.10),
- cdbs (>= 0.4.41),
docbook-to-man,
intltool (>= 0.41.0),
itstool (>= 1.2.0),
@@ -45,7 +44,9 @@
Package: libyelp0
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library for the GNOME help browser
@@ -58,6 +59,7 @@
Package: libyelp-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
libyelp0 (= ${binary:Version}),
libgtk-3-dev,
Modified: desktop/unstable/yelp/debian/libyelp-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/libyelp-dev.install?rev=48942&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/libyelp-dev.install [utf-8] (original)
+++ desktop/unstable/yelp/debian/libyelp-dev.install [utf-8] Fri May 27 13:56:56 2016
@@ -1,3 +1,3 @@
-usr/lib/libyelp.so
+usr/lib/*/libyelp.so
usr/include
usr/share/gtk-doc
Modified: desktop/unstable/yelp/debian/libyelp0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/libyelp0.install?rev=48942&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/libyelp0.install [utf-8] (original)
+++ desktop/unstable/yelp/debian/libyelp0.install [utf-8] Fri May 27 13:56:56 2016
@@ -1,2 +1,2 @@
-usr/lib/libyelp.so.*
-usr/lib/yelp/web-extensions/*.so
+usr/lib/*/libyelp.so.*
+usr/lib/*/yelp/web-extensions/*.so
Modified: desktop/unstable/yelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/rules?rev=48942&op=diff
==============================================================================
--- desktop/unstable/yelp/debian/rules [utf-8] (original)
+++ desktop/unstable/yelp/debian/rules [utf-8] Fri May 27 13:56:56 2016
@@ -1,22 +1,24 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_DH_MAKESHLIBS_ARGS_ALL += -X/usr/lib/yelp/ -V -- -c4
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND= -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+%:
+ dh $@ --parallel --with autoreconf,gnome
-# Temporarily disable building the gtk-doc documentation
-# and ship the pre-generated files until we have a fix for
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803104
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-gtk-doc
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)" \
+ --enable-gtk-doc
-clean::
+override_dh_auto_build:
+ dh_auto_build
+ /usr/bin/docbook-to-man debian/yelp.sgml > debian/yelp.1
+
+override_dh_makeshlibs:
+ dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/yelp/ -V -- -c4
+
+override_dh_auto_clean:
+ dh_auto_clean
rm -f debian/yelp.1
-
-build/yelp::
- /usr/bin/docbook-to-man debian/yelp.sgml > debian/yelp.1
Added: desktop/unstable/yelp/debian/yelp.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/yelp/debian/yelp.docs?rev=48942&op=file
==============================================================================
--- desktop/unstable/yelp/debian/yelp.docs (added)
+++ desktop/unstable/yelp/debian/yelp.docs [utf-8] Fri May 27 13:56:56 2016
@@ -0,0 +1,2 @@
+NEWS
+README
More information about the pkg-gnome-commits
mailing list