aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-08-12 16:00:59 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-08-12 16:00:59 -0400
commit593e1b7626972e6068eabf1a6a79341c9f7fca57 (patch)
treeef27bb1582a8d144647a5757c683e4990af8004d
parente6361deeea11714f3d8d45d068b249c8d4b634ef (diff)
parentd88054a3a754778ea8221fe9187eea2bab21ac7b (diff)
downloadayatana-indicator-power-593e1b7626972e6068eabf1a6a79341c9f7fca57.tar.gz
ayatana-indicator-power-593e1b7626972e6068eabf1a6a79341c9f7fca57.tar.bz2
ayatana-indicator-power-593e1b7626972e6068eabf1a6a79341c9f7fca57.zip
releasing version 0.6-0ubuntu1
-rw-r--r--debian/changelog6
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules5
-rw-r--r--debian/source/format1
-rw-r--r--src/indicator-power.c6
5 files changed, 8 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index 87cca97..39320e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-indicator-power (0.6-0ubuntu1) UNRELEASED; urgency=low
+indicator-power (0.6-0ubuntu1) oneiric; urgency=low
* New upstream release.
- Show time left to use without brackets, time left to charge with
@@ -8,8 +8,10 @@ indicator-power (0.6-0ubuntu1) UNRELEASED; urgency=low
- Use a string when the energy source is not present instead
of 0%
- only batteries status icons are allowed in the menu title
+ * src/indicator-power.c
+ - cherry picked crasher fix
* debian/rules:
- - run intltool-update to update the translations template (lp: #820705)
+ - Don't autoreconf
-- Ken VanDine <ken.vandine@canonical.com> Fri, 12 Aug 2011 09:57:47 -0400
diff --git a/debian/control b/debian/control
index c4d2700..9eb4640 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: gnome
Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Build-Depends: debhelper (>= 8),
- quilt,
libgtk-3-dev,
libindicator3-dev (>= 0.3.90),
libupower-glib-dev (>= 0.9.5),
diff --git a/debian/rules b/debian/rules
index 772b862..4bfb412 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,11 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export AUTOPOINT = true
-
%:
- dh $@ --with autoreconf
+ dh $@
override_dh_install:
find debian/indicator-power -name \*.la -delete
find debian/indicator-power -name \*.a -delete
mkdir -p debian/indicator-power/usr/share/apport/package-hooks/
cp debian/source_indicator-power.py debian/indicator-power/usr/share/apport/package-hooks/
- cd po; intltool-update --pot --verbose
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/src/indicator-power.c b/src/indicator-power.c
index 9211b54..62cdb44 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -551,10 +551,10 @@ get_primary_device (GVariant *devices)
{
primary_device = device;
}
- }
- g_free (device_icon);
- g_free (object_path);
+ g_free (device_icon);
+ g_free (object_path);
+ }
if (discharging)
{