From 7c7458bb89015be2bbeea18a96a5f3c6a1af141d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 7 Jul 2011 14:22:03 -0400 Subject: releasing version 0.1-0ubuntu1 --- debian/rules | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 debian/rules (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..f5334e1 --- /dev/null +++ b/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ + +override_dh_install: + find debian/indicator-power -name \*.la -delete + find debian/indicator-power -name \*.a -delete -- cgit v1.2.3 From f459beee2fd4f48b084a84a8ce3acb628020f1ab Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Tue, 26 Jul 2011 16:35:23 -0400 Subject: releasing version 0.4-0ubuntu1 --- debian/changelog | 6 ++++-- debian/rules | 2 ++ debian/source_indicator-power.py | 12 ++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 debian/source_indicator-power.py (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index ea92d0e..d687035 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,14 @@ -indicator-power (0.4-0ubuntu1) UNRELEASED; urgency=low +indicator-power (0.4-0ubuntu1) oneiric; urgency=low * New upstream release. - Always select a device (LP: #810872) - Use the dbus interface provided in g-s-d 3.1.4 * debian/control - Added build depends for gnome-settings-daemon-dev >= 3.1.4 + * debian/source_indicator-power.py + - Install apport hook to collect upower -d output - -- Ken VanDine Tue, 19 Jul 2011 12:52:06 -0400 + -- Ken VanDine Tue, 26 Jul 2011 16:34:30 -0400 indicator-power (0.3-0ubuntu1) oneiric; urgency=low diff --git a/debian/rules b/debian/rules index f5334e1..63a4ed6 100755 --- a/debian/rules +++ b/debian/rules @@ -15,3 +15,5 @@ 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/ diff --git a/debian/source_indicator-power.py b/debian/source_indicator-power.py new file mode 100644 index 0000000..ea0cf0f --- /dev/null +++ b/debian/source_indicator-power.py @@ -0,0 +1,12 @@ +'''apport package hook for indicator-power + +(c) 2011 Canonical Ltd. +Author: Ken VanDine +''' + +from apport.hookutils import * +from os import path + +def add_info(report): + report['UPowerDump'] = command_output(['upower', '-d']) + return report -- cgit v1.2.3 From 20013a81b669c6cc85e42ae13fe64919431d657d Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 28 Jul 2011 13:01:35 -0400 Subject: releasing version 0.4-0ubuntu2 --- debian/changelog | 9 +++++++++ debian/patches/fix_defines.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 9 +++------ 4 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 debian/patches/fix_defines.patch create mode 100644 debian/patches/series (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index d687035..9854623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-power (0.4-0ubuntu2) oneiric; urgency=low + + * debian/patches/fix_defines.patch + - Use the HAVE_GSD defines so it works without gpm + * debian/rules + - added autoreconf + + -- Ken VanDine Thu, 28 Jul 2011 12:59:33 -0400 + indicator-power (0.4-0ubuntu1) oneiric; urgency=low * New upstream release. diff --git a/debian/patches/fix_defines.patch b/debian/patches/fix_defines.patch new file mode 100644 index 0000000..35d822a --- /dev/null +++ b/debian/patches/fix_defines.patch @@ -0,0 +1,25 @@ +=== modified file 'Makefile.am' +--- old/Makefile.am 2011-07-15 09:26:50 +0000 ++++ new/Makefile.am 2011-07-28 16:51:20 +0000 +@@ -13,6 +13,7 @@ + libpower_la_CFLAGS = \ + $(UPOWER_CFLAGS) \ + $(INDICATOR_CFLAGS) \ ++ -DHAVE_GSD \ + -Wall -Werror \ + -DG_LOG_DOMAIN=\"Indicator-Power\" + libpower_la_LIBADD = \ + +=== modified file 'configure.ac' +--- old/configure.ac 2011-07-18 13:40:17 +0000 ++++ new/configure.ac 2011-07-28 16:51:16 +0000 +@@ -39,7 +39,7 @@ + gtk+-3.0 >= $GTK_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION + ]) +-PKG_CHECK_MODULES([GSD],[gnome-settings-daemon>= $GSD_REQUIRED_VERSION], ++PKG_CHECK_MODULES([GSD],[gnome-settings-daemon >= $GSD_REQUIRED_VERSION], + [have_gsd=yes],[have_gsd=no]) + AM_CONDITIONAL([HAVE_GSD],[test x$have_gsd = xyes]) + + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5eb90f8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix_defines.patch diff --git a/debian/rules b/debian/rules index 63a4ed6..3239663 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,13 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export AUTOPOINT = true + %: - dh $@ + dh $@ --with autoreconf override_dh_install: find debian/indicator-power -name \*.la -delete -- cgit v1.2.3 From b4f0934ea725ea8fed2d27298127f62bdb15fc6b Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 14 Nov 2012 16:46:50 -0500 Subject: * debian/rules: - use the dh sequencer with --with autoreconf. - override dh_autoreconf to call autogen.sh from upstream. --- debian/changelog | 3 +++ debian/rules | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index b98ebc7..ceeea91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ indicator-power (12.10.6-0ubuntu1) UNRELEASED; urgency=low - Use trailing commas for dep lists, as per other indicator packages. - Update Vcs-Bzr and Vcs-Browser fields, add notice to uploaders. * debian/compat: bump to compat level 9. + * debian/rules: + - use the dh sequencer with --with autoreconf. + - override dh_autoreconf to call autogen.sh from upstream. -- Mathieu Trudel-Lapierre Wed, 14 Nov 2012 13:55:03 -0500 diff --git a/debian/rules b/debian/rules index 4bfb412..2484aa0 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,10 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --with autoreconf + +override_dh_autoreconf: + NOCONFIGURE=1 dh-autoreconf ./autogen.sh override_dh_install: find debian/indicator-power -name \*.la -delete -- cgit v1.2.3 From 11b06f32bb7268ac66d12d91a4d079d314b99e48 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 14 Nov 2012 16:51:39 -0500 Subject: use DPKG_GENSYMBOLS_CHECK_LEVEL=4. --- debian/changelog | 1 + debian/rules | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index ceeea91..f303796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ indicator-power (12.10.6-0ubuntu1) UNRELEASED; urgency=low * debian/rules: - use the dh sequencer with --with autoreconf. - override dh_autoreconf to call autogen.sh from upstream. + - use DPKG_GENSYMBOLS_CHECK_LEVEL=4. -- Mathieu Trudel-Lapierre Wed, 14 Nov 2012 13:55:03 -0500 diff --git a/debian/rules b/debian/rules index 2484aa0..5490305 100755 --- a/debian/rules +++ b/debian/rules @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +export DPKG_GENSYMBOLS_CHECK_LEVEL=4 + %: dh $@ --with autoreconf -- cgit v1.2.3 From 8989d86c70064791180a0fa3cafbe45f6369f6b0 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 14 Nov 2012 16:58:54 -0500 Subject: debian/rules: it's dh_autoreconf, not dh-autoreconf. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 5490305..bd1bd9c 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 dh $@ --with autoreconf override_dh_autoreconf: - NOCONFIGURE=1 dh-autoreconf ./autogen.sh + NOCONFIGURE=1 dh_autoreconf ./autogen.sh override_dh_install: find debian/indicator-power -name \*.la -delete -- cgit v1.2.3 From 721e3c4f3bdc9487eef51f7a4bc83a06dd2be3ec Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Thu, 15 Nov 2012 12:20:50 -0500 Subject: make sure we call dh_install --fail-missing in the dh_install override, to be consistent with other indicator packages. --- debian/changelog | 2 ++ debian/rules | 1 + 2 files changed, 3 insertions(+) (limited to 'debian/rules') diff --git a/debian/changelog b/debian/changelog index 8130033..f002751 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ indicator-power (12.10.6-0ubuntu1) UNRELEASED; urgency=low - use the dh sequencer with --with autoreconf. - override dh_autoreconf to call autogen.sh from upstream. - use DPKG_GENSYMBOLS_CHECK_LEVEL=4. + - make sure we call dh_install --fail-missing in the dh_install override, + to be consistent with other indicator packages. -- Mathieu Trudel-Lapierre Wed, 14 Nov 2012 13:55:03 -0500 diff --git a/debian/rules b/debian/rules index bd1bd9c..83edd94 100755 --- a/debian/rules +++ b/debian/rules @@ -15,5 +15,6 @@ override_dh_autoreconf: override_dh_install: find debian/indicator-power -name \*.la -delete find debian/indicator-power -name \*.a -delete + dh_install --fail-missing mkdir -p debian/indicator-power/usr/share/apport/package-hooks/ cp debian/source_indicator-power.py debian/indicator-power/usr/share/apport/package-hooks/ -- cgit v1.2.3