r50030 - in /desktop/unstable/devhelp/debian: changelog control.in devhelp.docs docs rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Fri Sep 2 20:55:15 UTC 2016


Author: biebl
Date: Fri Sep  2 20:55:15 2016
New Revision: 50030

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

Added:
    desktop/unstable/devhelp/debian/devhelp.docs
      - copied, changed from r50029, desktop/unstable/devhelp/debian/docs
Removed:
    desktop/unstable/devhelp/debian/docs
Modified:
    desktop/unstable/devhelp/debian/changelog
    desktop/unstable/devhelp/debian/control.in
    desktop/unstable/devhelp/debian/rules

Modified: desktop/unstable/devhelp/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/changelog?rev=50030&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/changelog	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/changelog	[utf-8] Fri Sep  2 20:55:15 2016
@@ -2,6 +2,7 @@
 
   * New upstream release.
   * Install man page provided by upstream instead of our own, outdated own.
+  * Convert from cdbs to dh.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 02 Sep 2016 22:13:03 +0200
 

Modified: desktop/unstable/devhelp/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/control.in?rev=50030&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/control.in	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/control.in	[utf-8] Fri Sep  2 20:55:15 2016
@@ -4,8 +4,7 @@
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
 Homepage: https://wiki.gnome.org/Apps/Devhelp
-Build-Depends: cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                gnome-common,
                gnome-pkg-tools,

Copied: desktop/unstable/devhelp/debian/devhelp.docs (from r50029, desktop/unstable/devhelp/debian/docs)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/devhelp.docs?rev=50030&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/docs	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/devhelp.docs	[utf-8] Fri Sep  2 20:55:15 2016
@@ -1,2 +1,3 @@
 AUTHORS
+NEWS
 README

Modified: desktop/unstable/devhelp/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/devhelp/debian/rules?rev=50030&op=diff
==============================================================================
--- desktop/unstable/devhelp/debian/rules	[utf-8] (original)
+++ desktop/unstable/devhelp/debian/rules	[utf-8] Fri Sep  2 20:55:15 2016
@@ -1,35 +1,33 @@
 #!/usr/bin/make -f
 
-export NOCONFIGURE=yes
-export DEB_DH_AUTORECONF_ARGS=./autogen.sh
-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
-
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
-
-# List any files which are not installed
-include /usr/share/cdbs/1/rules/utils.mk
-DEB_DH_INSTALL_ARGS := --list-missing
 
 X_TOOLS += misc/devhelp.vim \
 	misc/html2funcs.py \
 	misc/html2xml.py \
 	misc/man2xml.py
 
-clean::
-	rm -f debian/devhelp.emacsen-startup
+%:
+	dh $@ --with autoreconf,gnome,python3
 
-binary-install/devhelp-common::
-	dh_python3 -p$(cdbs_curpkg) /usr/lib/gedit/plugins
+override_dh_autoreconf:
+	NOCONFIGURE=true dh_autoreconf ./autogen.sh
 
-binary-post-install/devhelp::
-	install -d `pwd`/debian/devhelp/usr/share/doc/devhelp/tools/
-	install -m 644 $(X_TOOLS) \
-		`pwd`/debian/devhelp/usr/share/doc/devhelp/tools/
+override_dh_auto_configure:
+	dh_auto_configure -- --libdir=\$${prefix}/lib
 
-pre-build::
+override_dh_install:
+	dh_install --list-missing
+	install -d debian/devhelp/usr/share/doc/devhelp/tools/
+	install -m 644 $(X_TOOLS) debian/devhelp/usr/share/doc/devhelp/tools/
+
+override_dh_installemacsen:
 	cp misc/devhelp.el debian/devhelp.emacsen-startup
+	dh_installemacsen
+	rm debian/devhelp.emacsen-startup
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -- -c4
+
+override_dh_python3:
+	dh_python3 -pdevhelp-common /usr/lib/gedit/plugins




More information about the pkg-gnome-commits mailing list