r51161 - in /desktop/unstable/metacity/debian: changelog control control.in metacity.docs rules

mitya57 at users.alioth.debian.org mitya57 at users.alioth.debian.org
Sun Sep 25 18:58:49 UTC 2016


Author: mitya57
Date: Sun Sep 25 18:58:49 2016
New Revision: 51161

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=51161
Log:
Convert from cdbs to debhelper.

Added:
    desktop/unstable/metacity/debian/metacity.docs
Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/control
    desktop/unstable/metacity/debian/control.in
    desktop/unstable/metacity/debian/rules

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=51161&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog	[utf-8] (original)
+++ desktop/unstable/metacity/debian/changelog	[utf-8] Sun Sep 25 18:58:49 2016
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Rename libmetacity0 to libmetacity1, following upstream soname change.
+  * Convert from cdbs to debhelper.
 
  -- Dmitry Shachnev <mitya57 at debian.org>  Sun, 25 Sep 2016 21:20:26 +0300
 

Modified: desktop/unstable/metacity/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control?rev=51161&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control	[utf-8] (original)
+++ desktop/unstable/metacity/debian/control	[utf-8] Sun Sep 25 18:58:49 2016
@@ -7,10 +7,9 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Dmitry Shachnev <mitya57 at debian.org>
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 9.20160114~),
+Build-Depends: debhelper (>= 9.20160114~),
                dh-autoreconf,
-               gnome-pkg-tools (>= 0.10),
+               gnome-pkg-tools (>= 0.17),
                gsettings-desktop-schemas-dev (>= 3.3.0),
                libcanberra-gtk3-dev,
                libglib2.0-dev (>= 2.44.0),

Modified: desktop/unstable/metacity/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/control.in?rev=51161&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/control.in	[utf-8] (original)
+++ desktop/unstable/metacity/debian/control.in	[utf-8] Sun Sep 25 18:58:49 2016
@@ -3,10 +3,9 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.41),
-               debhelper (>= 9.20160114~),
+Build-Depends: debhelper (>= 9.20160114~),
                dh-autoreconf,
-               gnome-pkg-tools (>= 0.10),
+               gnome-pkg-tools (>= 0.17),
                gsettings-desktop-schemas-dev (>= 3.3.0),
                libcanberra-gtk3-dev,
                libglib2.0-dev (>= 2.44.0),

Added: desktop/unstable/metacity/debian/metacity.docs
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/metacity.docs?rev=51161&op=file
==============================================================================
--- desktop/unstable/metacity/debian/metacity.docs	(added)
+++ desktop/unstable/metacity/debian/metacity.docs	[utf-8] Sun Sep 25 18:58:49 2016
@@ -0,0 +1 @@
+doc/theme-format.txt

Modified: desktop/unstable/metacity/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/rules?rev=51161&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/rules	[utf-8] (original)
+++ desktop/unstable/metacity/debian/rules	[utf-8] Sun Sep 25 18:58:49 2016
@@ -1,17 +1,15 @@
 #!/usr/bin/make -f
 
-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/cdbs/1/rules/autoreconf.mk
-include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
-DEB_CONFIGURE_EXTRA_FLAGS = --libdir="\$${prefix}/lib/$(DEB_HOST_MULTIARCH)"
+%:
+	dh $@ --with autoreconf,gnome
 
-DEB_INSTALL_CHANGELOGS_ALL = ./NEWS
-DEB_INSTALL_DOCS_metacity += doc/theme-format.txt
-DEB_DH_STRIP_ARGS_ALL += --dbgsym-migration='metacity-dbg (<< 1:3.18.4-1~)'
+override_dh_installdocs:
+	dh_installdocs -A ./AUTHORS ./README
 
-LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+override_dh_installchangelogs:
+	dh_installchangelogs ./NEWS
+
+override_dh_strip:
+	dh_strip --dbgsym-migration='metacity-dbg (<< 1:3.18.4-1~)'




More information about the pkg-gnome-commits mailing list