aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
-rw-r--r--debian/indicator-sound-gtk2.debhelper.log1
-rw-r--r--debian/indicator-sound.debhelper.log1
-rw-r--r--debian/patches/debian-changes-0.7.3-0ubuntu156
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules2
6 files changed, 13 insertions, 60 deletions
diff --git a/debian/changelog b/debian/changelog
index 20eaa75..081977c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+indicator-sound (0.7.4.1-0ubuntu1) oneiric; urgency=low
+
+ * New upstream release.
+ - menu resizes on reopen (LP: #809275)
+ - pulse indication of SoundMenu play button not strong
+ enough (LP: #742251)
+ * debian/rules
+ - Moved autoreconf to the top
+ * New upstream release.
+
+ -- Ken VanDine <ken.vandine@canonical.com> Fri, 29 Jul 2011 13:21:41 -0400
+
indicator-sound (0.7.3-0ubuntu1) oneiric; urgency=low
* New upstream release.
diff --git a/debian/indicator-sound-gtk2.debhelper.log b/debian/indicator-sound-gtk2.debhelper.log
deleted file mode 100644
index 4b04259..0000000
--- a/debian/indicator-sound-gtk2.debhelper.log
+++ /dev/null
@@ -1 +0,0 @@
-dh_autoreconf_clean
diff --git a/debian/indicator-sound.debhelper.log b/debian/indicator-sound.debhelper.log
deleted file mode 100644
index 4b04259..0000000
--- a/debian/indicator-sound.debhelper.log
+++ /dev/null
@@ -1 +0,0 @@
-dh_autoreconf_clean
diff --git a/debian/patches/debian-changes-0.7.3-0ubuntu1 b/debian/patches/debian-changes-0.7.3-0ubuntu1
deleted file mode 100644
index 86143a2..0000000
--- a/debian/patches/debian-changes-0.7.3-0ubuntu1
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: Upstream changes introduced in version 0.7.3-0ubuntu1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- indicator-sound (0.7.3-0ubuntu1) oneiric; urgency=low
- .
- * New upstream release.
- - libindicator scroll signals (LP: #804618)
- - metadatawidget collapse (LP: #806439)
- * debian/control
- - Bumped build depends for libindicator to 0.3.90
- * debian/patches/gtk3_define.patch
- - dropped
- * configure.ac
- - Fixup pkgconfig check for libindicator-0.4
- * debian/rules
- - Added autoreconf.mk
- .
- The person named in the Author field signed this changelog entry.
-Author: Ken VanDine <ken.vandine@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/804618
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/806439
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- indicator-sound-0.7.3.orig/configure.ac
-+++ indicator-sound-0.7.3/configure.ac
-@@ -115,12 +115,12 @@ AS_IF([test "x$with_localinstall" = "xye
- ],
- [AS_IF([test "x$with_gtk" = "x2"],
- [
-- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
-- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
-+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
-+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
- ],
- [
-- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
-- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
-+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
- ])])
- AC_SUBST(INDICATORDIR)
- AC_SUBST(INDICATORICONSDIR)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a3bd8ad..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes-0.7.3-0ubuntu1
diff --git a/debian/rules b/debian/rules
index 2c0cbeb..dfd669b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,9 @@
DEB_BUILDDIR = build
DEB_MAKE_FLAVORS = gtk2 gtk3
+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/autoreconf.mk
DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/