aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2010-06-16 09:52:28 +0200
committerEvgeni Golov <evgeni@debian.org>2010-06-16 09:52:28 +0200
commite3df28309fff9d052b6474821870beb724b64ce5 (patch)
treedc1150843593ced43a284563e132efa1af362fc8
parent30f1ae42f91519b8f06660c8c352a5fefb301c4b (diff)
downloadlibayatana-indicator-e3df28309fff9d052b6474821870beb724b64ce5.tar.gz
libayatana-indicator-e3df28309fff9d052b6474821870beb724b64ce5.tar.bz2
libayatana-indicator-e3df28309fff9d052b6474821870beb724b64ce5.zip
Revert cdbs drop, as requested by the Ubuntu maintainers.
-rw-r--r--debian/changelog6
-rw-r--r--debian/control3
-rwxr-xr-xdebian/rules12
3 files changed, 11 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index cd22c14..4a78988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libindicator (0.3.8-2) unstable; urgency=low
+
+ * Revert cdbs drop, as requested by the Ubuntu maintainers.
+
+ -- Evgeni Golov <evgeni@debian.org> Wed, 16 Jun 2010 09:51:54 +0200
+
libindicator (0.3.8-1) unstable; urgency=low
* Merge Ubuntu package into Debian.
diff --git a/debian/control b/debian/control
index 6edb124..8748c62 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: libs
Priority: optional
Maintainer: Evgeni Golov <evgeni@debian.org>
Uploaders: Kartik Mistry <kartik@debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 5.0),
+ cdbs (>= 0.4.41),
libglib2.0-dev (>= 2.22),
libgtk2.0-dev (>= 2.12.0),
libdbus-glib-1-dev,
diff --git a/debian/rules b/debian/rules
index 9612514..151c78d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,8 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
-%:
- dh $@
-
-override_dh_auto_test:
-
-override_dh_makeshlibs:
- dh_makeshlibs -V 'libindicator0 (>= 0.3.6)'
+DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)'