r52157 - in /desktop/experimental/glib2.0/debian: changelog control control.in rules
smcv at users.alioth.debian.org
smcv at users.alioth.debian.org
Fri Mar 3 21:58:34 UTC 2017
Author: smcv
Date: Fri Mar 3 21:58:33 2017
New Revision: 52157
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52157
Log:
Build with dh instead of cdbs
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control
desktop/experimental/glib2.0/debian/control.in
desktop/experimental/glib2.0/debian/rules
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=52157&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Mar 3 21:58:33 2017
@@ -26,6 +26,7 @@
detached debug symbols from libglib2.0-0-dbg to autogenerated -dbgsym
packages
* Fix lintian warnings about useless use of dh-exec
+ * Build with dh instead of cdbs
-- Simon McVittie <smcv at debian.org> Thu, 02 Mar 2017 09:15:48 +0000
Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=52157&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Fri Mar 3 21:58:33 2017
@@ -4,7 +4,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 9.20141010),
- cdbs (>= 0.4.93),
dh-autoreconf,
dh-exec,
dh-python,
Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=52157&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Fri Mar 3 21:58:33 2017
@@ -4,7 +4,6 @@
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 9.20141010),
- cdbs (>= 0.4.93),
dh-autoreconf,
dh-exec,
dh-python,
Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=52157&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Fri Mar 3 21:58:33 2017
@@ -1,20 +1,12 @@
#!/usr/bin/make -f
-DEB_BUILDDIR = debian/build
-DEB_MAKE_FLAVORS = deb udeb
DISABLE_UPDATE_UPLOADERS := 1
-include /usr/share/cdbs/1/rules/autoreconf.mk
-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/dpkg/default.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := glib
-
-# Enable parallel build support
-DEB_BUILD_PARALLEL = 1
# Ensure the build aborts when there are still references to undefined symbols
LDFLAGS += -Wl,-z,defs
@@ -40,19 +32,36 @@
UDEB_PKG := libglib$(APIVER)-udeb
DOC_PKG := libglib$(APIVER)-doc
-DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
+%:
+ dh $@ --with autoreconf,gnome,python3
-DEB_CLEAN_EXCLUDE = org.gtk.test.gschema.xml.orig
+override_dh_auto_configure:
+ dh_auto_configure \
+ --builddirectory=debian/build/deb \
+ -- \
+ $(DEB_CONFIGURE_EXTRA_FLAGS) \
+ $(DEB_CONFIGURE_FLAGS_deb) \
+ $(NULL)
+ dh_auto_configure \
+ --builddirectory=debian/build/udeb \
+ -- \
+ $(DEB_CONFIGURE_EXTRA_FLAGS) \
+ $(DEB_CONFIGURE_FLAGS_udeb) \
+ $(NULL)
-DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/deb
-DEB_DH_INSTALL_ARGS_$(TEST_PKG) += --sourcedir=debian/install/deb -X.la
-DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/udeb
+override_dh_clean:
+ dh_clean -Xorg.gtk.test.gschema.xml.orig
-DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4
-DEB_DH_STRIP_ARGS = --dbgsym-migration='libglib2.0-0-dbg (<< 2.51.4-1~)'
+override_dh_makeshlibs:
+ dh_makeshlibs -V --add-udeb=$(UDEB_PKG) -- -c4
+override_dh_strip:
+ dh_strip --dbgsym-migration='libglib2.0-0-dbg (<< 2.51.4-1~)'
+
+# (Ubuntu-specific)
# Don't strip translations from the installed tests; makes them environment dependent.
-DEB_DH_TRANSLATIONS_ARGS = -Xinstalled-tests
+override_dh_translations:
+ dh_translations -Xinstalled-tests
# Do not clutter $HOME with ~/.dbus-keyrings and avoid failure on the buildds
# where creating /home/buildd/.dbus-keyrings fails
@@ -74,9 +83,11 @@
export DBUS_SESSION_BUS_ADDRESS=this-should-not-be-used-and-will-fail:
ifeq ($(DEB_HOST_ARCH_OS), linux)
- DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check -j1)
+override_dh_auto_test:
+ dh_auto_test -- --builddirectory=debian/build/deb -k check -j1
else
- DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check -j1 || true)
+override_dh_auto_test:
+ dh_auto_test -- --builddirectory=debian/build/deb -k check -j1 || true
endif
# The tests assume this directory exists and is writable
@@ -89,6 +100,7 @@
DEB_CONFIGURE_EXTRA_FLAGS := \
--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --libexecdir=\$${prefix}/lib/glib2.0 \
--with-python=/usr/bin/python3 \
--with-pcre=system
@@ -119,22 +131,30 @@
--disable-selinux \
--disable-libmount
-pre-build::
- mkdir -p debian/stamp-makefile-check \
- debian/tmp-xdg-runtime-dir
+override_dh_auto_build:
+ mkdir -p debian/tmp-xdg-runtime-dir
+ dh_auto_build --builddirectory=debian/build/deb
+ dh_auto_build --builddirectory=debian/build/udeb
-binary-install/libglib2.0-0::
+override_dh_auto_install:
set -e; for script in postinst postrm triggers; do \
sed -e"s/#MULTIARCH#/$(DEB_HOST_MULTIARCH)/g" \
-e"s/#ARCH#/$(DEB_HOST_ARCH)/g" \
- debian/$(cdbs_curpkg).$$script.in \
- > debian/$(cdbs_curpkg).$$script ; \
+ debian/$(SHARED_PKG).$$script.in \
+ > debian/$(SHARED_PKG).$$script ; \
done
+ dh_auto_install -p$(TEST_PKG) --sourcedir=debian/build/deb -X.la
+ dh_auto_install -p$(UDEB_PKG) --builddirectory=debian/build/udeb --destdir=debian/install/udeb
+ dh_auto_install --remaining-packages --builddirectory=debian/build/deb --destdir=debian/install/deb
-binary-install/libglib2.0-dev-bin::
+override_dh_python3:
dh_python3 -plibglib2.0-dev-bin /usr/share/glib-2.0/codegen
-clean::
+# Don't regenerate d/control, we do that explicitly in clean
+override_dh_gnome_clean:
+ dh_gnome_clean --no-control
+
+clean:
sed \
-e "s#@SONAME@#$(SONAME)#g" \
-e "s#@APIVER@#$(APIVER)#g" \
@@ -150,10 +170,27 @@
debian/control.in > debian/control
rm -rf $(CURDIR)/debian/build \
$(CURDIR)/debian/install \
- $(CURDIR)/debian/stamp-makefile-check \
$(CURDIR)/debian/tmp-xdg-runtime-dir
+ dh clean --with gnome,python3
-list-missing:
- # FIXME: remove this when CDBS' list-missing works with multiple flavors
- perl -w debian/dh_listmissing.pl $(foreach f,$(DEB_MAKE_FLAVORS),debian/install/$(f)) 2>&1 | \
- egrep -v '(\.la|\.pyc|\.pyo) has been installed' >&2
+override_dh_install:
+ # Unwanted bits from the .deb build
+ rm -f debian/install/deb/lib/*/*.la
+ rm -f debian/install/deb/usr/lib/*/*.la
+ rm -f debian/install/deb/usr/lib/glib2.0/installed-tests/glib/*.la
+ rm -f debian/install/deb/usr/lib/glib2.0/installed-tests/glib/modules/*.la
+ rm -fr debian/install/deb/usr/share/glib-2.0/codegen/__pycache__
+ # Re-created by .links to point into /lib
+ rm -f debian/install/deb/usr/lib/*/libglib-2.0.so
+ # Unwanted bits from the .udeb build
+ rm -f debian/install/udeb/lib/*/*.la
+ rm -f debian/install/udeb/usr/lib/*/*.la
+ rm -f debian/install/udeb/usr/lib/*/*.so
+ rm -fr debian/install/udeb/usr/share/gdb
+ rm -fr debian/install/udeb/usr/share/gettext/its
+ rm -fr debian/install/udeb/usr/share/glib-2.0/codegen
+ rm -fr debian/install/udeb/usr/share/glib-2.0/gdb
+ rm -fr debian/install/udeb/usr/share/glib-2.0/valgrind
+ rm -fr debian/install/udeb/usr/share/man
+ dh_install -p$(UDEB_PKG) --sourcedir=debian/install/udeb --list-missing
+ dh_install --remaining-packages --sourcedir=debian/install/deb --list-missing
More information about the pkg-gnome-commits
mailing list