summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-09-19 22:43:47 +0000
committerMichael Biebl <biebl@debian.org>2016-09-19 22:43:47 +0000
commitedaa72ff7ee2aaa41cf51ba8aed9c47c04f4cfb0 (patch)
treec713c86b8d8ae78fe729f9e8fc3ec0e7ea8e9642
parentNew upstream release. (diff)
downloadzenity-edaa72ff7ee2aaa41cf51ba8aed9c47c04f4cfb0.tar.gz
zenity-edaa72ff7ee2aaa41cf51ba8aed9c47c04f4cfb0.tar.bz2
zenity-edaa72ff7ee2aaa41cf51ba8aed9c47c04f4cfb0.zip
Convert from cdbs to dh.
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
-rw-r--r--debian/control.in2
-rwxr-xr-xdebian/rules12
-rw-r--r--debian/zenity.docs3
5 files changed, 12 insertions, 8 deletions
diff --git a/debian/changelog b/debian/changelog
index a651590b..60cd5cc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
zenity (3.22.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Convert from cdbs to dh.
-- Michael Biebl <biebl@debian.org> Tue, 20 Sep 2016 00:34:33 +0200
diff --git a/debian/control b/debian/control
index dc45e18e..4b843d84 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
Build-Depends: debhelper (>= 9),
- cdbs (>= 0.4.4),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
yelp-tools,
intltool (>= 0.40.0),
diff --git a/debian/control.in b/debian/control.in
index 54eb5091..301208a3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 9),
- cdbs (>= 0.4.4),
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
yelp-tools,
intltool (>= 0.40.0),
diff --git a/debian/rules b/debian/rules
index 7eeef872..a8a82086 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
#!/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/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-DEB_DH_INSTALL_ARGS += --list-missing
+%:
+ dh $@ --with autoreconf,gnome
+
+override_dh_install:
+ dh_install --list-missing
diff --git a/debian/zenity.docs b/debian/zenity.docs
new file mode 100644
index 00000000..6f83607c
--- /dev/null
+++ b/debian/zenity.docs
@@ -0,0 +1,3 @@
+AUTHORS
+NEWS
+README
bgstack15