r53673 - in /packages/unstable/libgda5/debian: changelog compat control control.in libgda-5.0-4.install libgda-5.0-dev.install libgda-5.0-mysql.install libgda-5.0-postgres.install rules
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Mon Sep 11 21:32:17 UTC 2017
Author: jordi
Date: Mon Sep 11 21:32:17 2017
New Revision: 53673
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53673
Log:
Rewrite debian/rules using dh sequencer and move away from CDBS.
Modified:
packages/unstable/libgda5/debian/changelog
packages/unstable/libgda5/debian/compat
packages/unstable/libgda5/debian/control
packages/unstable/libgda5/debian/control.in
packages/unstable/libgda5/debian/libgda-5.0-4.install
packages/unstable/libgda5/debian/libgda-5.0-dev.install
packages/unstable/libgda5/debian/libgda-5.0-mysql.install
packages/unstable/libgda5/debian/libgda-5.0-postgres.install
packages/unstable/libgda5/debian/rules
Modified: packages/unstable/libgda5/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/changelog?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/changelog [utf-8] (original)
+++ packages/unstable/libgda5/debian/changelog [utf-8] Mon Sep 11 21:32:17 2017
@@ -4,6 +4,7 @@
* Add missing Build-Dep on dh_python (lintian).
* Add remove_builddate.patch: remove references to GDA_BUILDDATE in
generated documentation to fix build reproducibility.
+ * Rewrite debian/rules using dh sequencer and move away from CDBS.
-- Jordi Mallach <jordi at debian.org> Mon, 04 Sep 2017 02:45:19 +0200
Modified: packages/unstable/libgda5/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/compat?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/compat [utf-8] (original)
+++ packages/unstable/libgda5/debian/compat [utf-8] Mon Sep 11 21:32:17 2017
@@ -1 +1 @@
-9
+10
Modified: packages/unstable/libgda5/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/control?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/control [utf-8] (original)
+++ packages/unstable/libgda5/debian/control [utf-8] Mon Sep 11 21:32:17 2017
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Michael Biebl <biebl at debian.org>, Piotr Pokora <piotrek.pokora at gmail.com>
+Uploaders: , Piotr Pokora <piotrek.pokora at gmail.com>
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libgda5/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libgda5/
Build-Depends: cdbs (>= 0.4.90),
Modified: packages/unstable/libgda5/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/control.in?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/control.in [utf-8] (original)
+++ packages/unstable/libgda5/debian/control.in [utf-8] Mon Sep 11 21:32:17 2017
@@ -5,8 +5,7 @@
Uploaders: @GNOME_TEAM@, Piotr Pokora <piotrek.pokora at gmail.com>
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/libgda5/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/libgda5/
-Build-Depends: cdbs (>= 0.4.90),
- debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
dh-python,
gnome-pkg-tools (>= 0.11),
intltool (>= 0.40.6),
Modified: packages/unstable/libgda5/debian/libgda-5.0-4.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/libgda-5.0-4.install?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/libgda-5.0-4.install [utf-8] (original)
+++ packages/unstable/libgda5/debian/libgda-5.0-4.install [utf-8] Mon Sep 11 21:32:17 2017
@@ -1,3 +1,3 @@
-usr/lib/libgda*.so.*
-usr/lib/libgda*/providers/libgda-sqlite.so
-usr/lib/libgda*/providers/libgda-web.so
+usr/lib/*/libgda*.so.*
+usr/lib/*/libgda*/providers/libgda-sqlite.so
+usr/lib/*/libgda*/providers/libgda-web.so
Modified: packages/unstable/libgda5/debian/libgda-5.0-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/libgda-5.0-dev.install?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/libgda-5.0-dev.install [utf-8] (original)
+++ packages/unstable/libgda5/debian/libgda-5.0-dev.install [utf-8] Mon Sep 11 21:32:17 2017
@@ -1,8 +1,8 @@
usr/include
-usr/lib/*.so
-usr/lib/pkgconfig/libgda-5.0.pc
-usr/lib/pkgconfig/libgda-report-5.0.pc
-usr/lib/pkgconfig/libgda-xslt-5.0.pc
-usr/lib/pkgconfig/libgda-web-5.0.pc
-usr/lib/pkgconfig/libgda-sqlite-*.pc
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/libgda-5.0.pc
+usr/lib/*/pkgconfig/libgda-report-5.0.pc
+usr/lib/*/pkgconfig/libgda-xslt-5.0.pc
+usr/lib/*/pkgconfig/libgda-web-5.0.pc
+usr/lib/*/pkgconfig/libgda-sqlite-*.pc
usr/share/gir-1.0/Gda-5.0.gir
Modified: packages/unstable/libgda5/debian/libgda-5.0-mysql.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/libgda-5.0-mysql.install?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/libgda-5.0-mysql.install [utf-8] (original)
+++ packages/unstable/libgda5/debian/libgda-5.0-mysql.install [utf-8] Mon Sep 11 21:32:17 2017
@@ -1,2 +1,2 @@
-usr/lib/libgda*/providers/libgda-mysql.so
-usr/lib/pkgconfig/libgda-mysql-*.pc
+usr/lib/*/libgda*/providers/libgda-mysql.so
+usr/lib/*/pkgconfig/libgda-mysql-*.pc
Modified: packages/unstable/libgda5/debian/libgda-5.0-postgres.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/libgda-5.0-postgres.install?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/libgda-5.0-postgres.install [utf-8] (original)
+++ packages/unstable/libgda5/debian/libgda-5.0-postgres.install [utf-8] Mon Sep 11 21:32:17 2017
@@ -1,2 +1,2 @@
-usr/lib/libgda*/providers/libgda-postgres.so
-usr/lib/pkgconfig/libgda-postgres-*.pc
+usr/lib/*/libgda*/providers/libgda-postgres.so
+usr/lib/*/pkgconfig/libgda-postgres-*.pc
Modified: packages/unstable/libgda5/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/libgda5/debian/rules?rev=53673&op=diff
==============================================================================
--- packages/unstable/libgda5/debian/rules [utf-8] (original)
+++ packages/unstable/libgda5/debian/rules [utf-8] Mon Sep 11 21:32:17 2017
@@ -1,62 +1,64 @@
#!/usr/bin/make -f
# -*- Makefile -*-
-DISABLE_UPDATE_UPLOADERS := 1
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/class/gnome.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+include /usr/share/dpkg/default.mk
GNOME_MODULE := libgda
SONAME := 4
-LDFLAGS += -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export VERBOSE=1
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-# Enable parallel build support
-DEB_BUILD_PARALLEL = 1
+%:
+ dh $@ --with gnome
-DEB_DH_MAKESHLIBS_ARGS_libgda-5.0-$(SONAME) += -- -c4
-DEB_DH_MAKESHLIBS_ARGS_ALL += -X /usr/lib/libgda-5.0/providers
+override_dh_makeshlibs:
+ dh_makeshlibs -X /usr/lib/$(DEB_HOST_MULTIARCH)/libgda-5.0/providers \
+ -plibgda-5.0-$(SONAME) -- -c4
+ dh_makeshlibs -X /usr/lib/$(DEB_HOST_MULTIARCH)/libgda-5.0/providers
# Parallel builds break the test suite, see
# https://bugzilla.gnome.org/show_bug.cgi?id=723038
-DEB_MAKE_CHECK_TARGET = -j1 check
-# If the test suite fails, print the actual errors
-export VERBOSE=1
+override_dh_auto_test:
+ dh_auto_test -- -j1
-DEB_DH_STRIP_ARGS_libgda-5.0-4 = --dbgsym-migration='libgda-5.0-4-dbg (<< 5.2.4-4~)'
+override_dh_strip:
+ dh_strip --dbgsym-migration='libgda-5.0-$(SONAME)-dbg (<< 5.2.4-4~)'
-DEB_CONFIGURE_EXTRA_FLAGS += --with-postgres \
- --with-mysql \
- --with-libsoup \
- --without-bdb \
- --without-oracle \
- --without-ldap \
- --without-firebird \
- --without-mdb \
- --without-java \
- --without-gnome-keyring \
- --without-ui \
- --enable-system-sqlite \
- --enable-introspection \
- --disable-crypto \
- --enable-gtk-doc
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --with-postgres \
+ --with-mysql \
+ --with-libsoup \
+ --without-bdb \
+ --without-oracle \
+ --without-ldap \
+ --without-firebird \
+ --without-mdb \
+ --without-java \
+ --without-gnome-keyring \
+ --without-ui \
+ --enable-system-sqlite \
+ --enable-introspection \
+ --disable-crypto \
+ --enable-gtk-doc
-clean::
+override_dh_clean:
+ dh_clean
sed -e 's#@SONAME@#$(SONAME)#g' \
-e 's#@GNOME_TEAM@#$(UPLOADERS)#g' \
debian/control.in >debian/control
-binary-install/libgda-5.0-common::
+override_dh_install:
+ dh_install
# Don't ship our own copy of jquery.js
rm debian/libgda-5.0-common/usr/share/libgda-5.0/web/jquery.js
ln -s ../../javascript/jquery/jquery.js \
debian/libgda-5.0-common/usr/share/libgda-5.0/web/
- dh_python2 -p$(cdbs_curpkg) usr/share/libgda-5.0
+ dh_python2 -plibgda-5.0-common usr/share/libgda-5.0
-common-binary-post-install-arch::
set -e; for i in libgda-5.0-common libgda-5.0-bin libgda-5.0-dev \
libgda-5.0-mysql libgda-5.0-postgres libgda-5.0-sqlite; \
do \
@@ -64,7 +66,6 @@
dh_link -p$$i usr/share/doc/libgda-5.0-$(SONAME) usr/share/doc/$$i; \
done
-common-binary-predeb-arch::
find debian -name '*.la' -delete
# remove test database, not shipped.
rm -f debian/tmp/etc/libgda-5.0/sales_test.db
@@ -73,5 +74,3 @@
debian/tmp/usr/bin/gda-list-server-op \
debian/tmp/usr/bin/gda-sql
rm -f debian/tmp/usr/share/man/man1/gda-sql.1
-
-.PHONY: clean common-binary-post-install-arch
More information about the pkg-gnome-commits
mailing list