[debian-edu-commits] debian-edu/ 02/05: d/control, d/*.docs, d/rules: Convert from cdbs to simple dh rules, drop B-D on cdbs.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-artwork.

commit be64803abd64539d205a272dc4fbe1909cb50ab3
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Feb 12 08:05:52 2018 -0500

    d/control, d/*.docs, d/rules: Convert from cdbs to simple dh rules, drop B-D on cdbs.
---
 debian/control                           |  1 -
 debian/debian-edu-artwork-lines.docs     |  2 ++
 debian/debian-edu-artwork-softwaves.docs |  2 ++
 debian/rules                             | 24 ++++++++----------------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 5158c33..98c6761 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders: Petter Reinholdtsen <pere at debian.org>,
            Mike Gabriel <sunweaver at debian.org>,
            Wolfgang Schweer <wschweer at arcor.de>,
 Build-Depends: advancecomp,
-               cdbs,
                debhelper (>= 10.2.5~),
                imagemagick,
                inkscape,
diff --git a/debian/debian-edu-artwork-lines.docs b/debian/debian-edu-artwork-lines.docs
new file mode 100644
index 0000000..6f12db5
--- /dev/null
+++ b/debian/debian-edu-artwork-lines.docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/debian-edu-artwork-softwaves.docs b/debian/debian-edu-artwork-softwaves.docs
new file mode 100644
index 0000000..6f12db5
--- /dev/null
+++ b/debian/debian-edu-artwork-softwaves.docs
@@ -0,0 +1,2 @@
+AUTHORS
+README
diff --git a/debian/rules b/debian/rules
index d07cfea..6808130 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,16 @@
 
 include /usr/share/dpkg/pkg-info.mk
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
+%:
+	dh $@
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = -n
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/tmp
-DEB_DH_BUILDDEB_ARGS = -- -Zxz
-# don't ship empty upstream ChangeLog:
-DEB_INSTALL_CHANGELOGS_ALL =
+override_dh_installchangelogs:
+	# don't ship empty upstream ChangeLog:
+	dh_installchangelogs -XNEWS -XChangeLog
+
+override_dh_makeshlibs:
+	dh_makeshlibs --no-scripts
 
-sbindir := /usr/sbin/
-install/debian-edu-artwork-softwaves::
-	install -d debian/$(cdbs_curpkg)$(sbindir)
-	install debian/update-debian-edu-artwork-softwaves debian/$(cdbs_curpkg)$(sbindir)
-install/debian-edu-artwork-lines::
-	install -d debian/$(cdbs_curpkg)$(sbindir)
-	install debian/update-debian-edu-artwork-lines debian/$(cdbs_curpkg)$(sbindir)
 
 new-upstream-version: clean
 	mkdir -p $(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git