r54956 - in /attic/gtk2-engines/debian: changelog compat control control.in docs gtk2-engines-udeb.install gtk2-engines.install rules
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Sat Dec 2 02:02:05 UTC 2017
Author: jbicha
Date: Sat Dec 2 02:02:01 2017
New Revision: 54956
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54956
Log:
Switch from cdbs to dh
Added:
attic/gtk2-engines/debian/docs
Modified:
attic/gtk2-engines/debian/changelog
attic/gtk2-engines/debian/compat
attic/gtk2-engines/debian/control
attic/gtk2-engines/debian/control.in
attic/gtk2-engines/debian/gtk2-engines-udeb.install
attic/gtk2-engines/debian/gtk2-engines.install
attic/gtk2-engines/debian/rules
Modified: attic/gtk2-engines/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/changelog?rev=54956&op=diff
==============================================================================
--- attic/gtk2-engines/debian/changelog [utf-8] (original)
+++ attic/gtk2-engines/debian/changelog [utf-8] Sat Dec 2 02:02:01 2017
@@ -1,5 +1,10 @@
gtk2-engines (1:2.20.2-4) UNRELEASED; urgency=medium
+ * Switch from cdbs to dh
+ * Bump debhelper compat to 10
+ * Add debian/docs to install NEWS and README
+ * Don't fail the build for failing tests
+ * Install .pc file (Closes: #484367)
* Update debian/watch to only watch for gtk2 versions
-- Jeremy Bicha <jbicha at debian.org> Wed, 29 Nov 2017 19:21:09 -0500
Modified: attic/gtk2-engines/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/compat?rev=54956&op=diff
==============================================================================
--- attic/gtk2-engines/debian/compat [utf-8] (original)
+++ attic/gtk2-engines/debian/compat [utf-8] Sat Dec 2 02:02:01 2017
@@ -1 +1 @@
-5
+10
Modified: attic/gtk2-engines/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/control?rev=54956&op=diff
==============================================================================
--- attic/gtk2-engines/debian/control [utf-8] (original)
+++ attic/gtk2-engines/debian/control [utf-8] Sat Dec 2 02:02:01 2017
@@ -2,18 +2,15 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
-
Source: gtk2-engines
Section: gnome
Priority: optional
Maintainer: Ed Boraas <ed at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
- dh-autoreconf,
+Build-Depends: debhelper (>= 10),
libgtk2.0-dev (>= 2.19.7-2),
gnome-pkg-tools (>= 0.10),
- cdbs (>= 0.4.41),
libxml-parser-perl,
intltool
Modified: attic/gtk2-engines/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/control.in?rev=54956&op=diff
==============================================================================
--- attic/gtk2-engines/debian/control.in [utf-8] (original)
+++ attic/gtk2-engines/debian/control.in [utf-8] Sat Dec 2 02:02:01 2017
@@ -4,11 +4,9 @@
Maintainer: Ed Boraas <ed at debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 5),
- dh-autoreconf,
+Build-Depends: debhelper (>= 10),
libgtk2.0-dev (>= 2.19.7-2),
gnome-pkg-tools (>= 0.10),
- cdbs (>= 0.4.41),
libxml-parser-perl,
intltool
Added: attic/gtk2-engines/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/docs?rev=54956&op=file
==============================================================================
--- attic/gtk2-engines/debian/docs (added)
+++ attic/gtk2-engines/debian/docs [utf-8] Sat Dec 2 02:02:01 2017
@@ -0,0 +1,2 @@
+NEWS
+README
Modified: attic/gtk2-engines/debian/gtk2-engines-udeb.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/gtk2-engines-udeb.install?rev=54956&op=diff
==============================================================================
--- attic/gtk2-engines/debian/gtk2-engines-udeb.install [utf-8] (original)
+++ attic/gtk2-engines/debian/gtk2-engines-udeb.install [utf-8] Sat Dec 2 02:02:01 2017
@@ -1,3 +1,2 @@
-# from the directfb flavor
-usr/lib/gtk-2.0/*/engines/libclearlooks.so
-usr/lib/gtk-2.0/*/engines/libhcengine.so
+usr/lib/*/gtk-2.0/*/engines/libclearlooks.so
+usr/lib/*/gtk-2.0/*/engines/libhcengine.so
Modified: attic/gtk2-engines/debian/gtk2-engines.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/gtk2-engines.install?rev=54956&op=diff
==============================================================================
--- attic/gtk2-engines/debian/gtk2-engines.install [utf-8] (original)
+++ attic/gtk2-engines/debian/gtk2-engines.install [utf-8] Sat Dec 2 02:02:01 2017
@@ -1,4 +1 @@
-# from the x11 flavor
-usr/lib/gtk-2.0/*/engines/*.so
-usr/share/gtk-engines
-usr/share/themes/*/gtk-2.0
+usr
Modified: attic/gtk2-engines/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/gtk2-engines/debian/rules?rev=54956&op=diff
==============================================================================
--- attic/gtk2-engines/debian/rules [utf-8] (original)
+++ attic/gtk2-engines/debian/rules [utf-8] Sat Dec 2 02:02:01 2017
@@ -1,58 +1,31 @@
#!/usr/bin/make -f
-
-buildbasedir := $(CURDIR)/debian/build
-DEB_BUILDDIR := $(buildbasedir)/x11
-DEB_BUILDDIR_gtk2-engines-udeb := $(buildbasedir)/x11-udeb
-
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/utils.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 := gtk-engines
TARBALL_EXT := tar.bz2
-DEB_DESTDIR := $(CURDIR)/debian/tmp/x11
-DEB_DESTDIR_gtk2-engines-udeb := $(CURDIR)/debian/tmp/x11-udeb
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,-Bsymbolic -Wl,--as-needed
-DEB_DH_INSTALL_ARGS = --sourcedir=$(if $(findstring gtk2-engines-udeb,$(cdbs_curpkg)),$(DEB_DESTDIR_gtk2-engines-udeb),$(DEB_DESTDIR))
+%:
+ dh $@ --with gnome
+
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+
+override_dh_auto_configure:
+ dh_auto_configure -- --enable-animation --disable-lua
+
+override_dh_auto_test:
+ -dh_auto_test
+
+override_dh_install:
+ find debian/tmp -name '*.la' -print -delete
+ dh_install
+
+override_dh_missing:
+ dh_missing --fail-missing
# don't run dh_makeshlibs (we don't need shlibs for Gtk modules)
-DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
-
-# FIXME: This is required because of some automake weirdness
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,-Bsymbolic -Wl,--as-needed
-
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-animation --disable-lua
-DEB_CONFIGURE_UDEB_FLAGS = $(DEB_CONFIGURE_EXTRA_FLAGS)
-
-configure/gtk2-engines-udeb:: $(DEB_BUILDDIR_gtk2-engines-udeb)/config.status
-$(DEB_BUILDDIR_gtk2-engines-udeb)/config.status:
- cd $(DEB_BUILDDIR_gtk2-engines-udeb) && \
- $(DEB_CONFIGURE_SCRIPT_ENV) \
- $(DEB_CONFIGURE_SCRIPT) \
- $(DEB_CONFIGURE_NORMAL_ARGS) \
- $(cdbs_configure_flags) \
- $(DEB_CONFIGURE_EXTRA_FLAGS) \
- $(DEB_CONFIGURE_UDEB_FLAGS) \
- $(DEB_CONFIGURE_USER_FLAGS)
-
-build/gtk2-engines-udeb::
- make -C $(DEB_BUILDDIR_gtk2-engines-udeb)
-
-install/gtk2-engines-udeb::
- make -C $(DEB_BUILDDIR_gtk2-engines-udeb) install DESTDIR=$(DEB_DESTDIR_gtk2-engines-udeb)
-
-binary-install/gtk2-engines::
- cd debian/gtk2-engines/usr/lib && \
- mkdir $(DEB_HOST_MULTIARCH) && \
- mv gtk-2.0 $(DEB_HOST_MULTIARCH)/
- dh_gtkmodules -pgtk2-engines
-
-binary-install/gtk2-engines-udeb::
- dh_gtkmodules -pgtk2-engines-udeb
-
-clean::
- rm -rf $(buildbasedir)
+override_dh_makeshlibs:
+ dh_makeshlibs --no-act
More information about the pkg-gnome-commits
mailing list