Ubuntu
indicator-session package

Merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream into lp:~ubuntu-desktop/indicator-session/ubuntu

  1. Precise (12.04)
  2. upstream
  3. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 190
Proposed branch: lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream
Merge into: lp:~ubuntu-desktop/indicator-session/ubuntu
Diff against target: 162 lines (+54/-13)
6 files modified
AUTHORS (+1/-0)
ChangeLog (+28/-0)
aclocal.m4 (+8/-6)
configure (+8/-6)
configure.ac (+1/-1)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~indicator-applet-developers/ubuntu/precise/indicator-session/upstream
Reviewer Review Type Date Requested Status
Sebastien Bacher Pending
Ken VanDine Pending
Review via email: mp+96838@code.launchpad.net

Description of the change

New version!

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2012-02-23 14:55:02 +0000
3+++ AUTHORS 2012-03-09 21:34:21 +0000
4@@ -22,5 +22,6 @@
5 Michael Terry
6 Neil Jagdish Patel
7 Robert Ancell
8+ Sebastien Bacher
9 Ted Gould
10 vish
11
12=== modified file 'ChangeLog'
13--- ChangeLog 2012-02-23 14:55:02 +0000
14+++ ChangeLog 2012-03-09 21:34:21 +0000
15@@ -1,5 +1,33 @@
16 # Generated by Makefile. Do not edit.
17
18+2012-03-09 Ted Gould <ted@gould.cx>
19+
20+ 0.3.93
21+
22+2012-03-06 Sebastien Bacher <seb128@ubuntu.com>
23+
24+ enforce locking that's still needed and will not be solved this cycle
25+
26+2012-02-27 Sebastien Bacher <seb128@ubuntu.com>
27+
28+ Revert r239, there are still issues, to sort next cycle
29+
30+2012-03-06 Conor Curran <conor.curran@canonical.com>
31+
32+ merge the icon change fix
33+
34+2012-03-06 Conor Curran <conor.curran@canonical.com>
35+
36+ make sure to change the icon on the panel when we get a restart signal from package kit
37+
38+2012-03-06 Conor Curran <conor.curran@canonical.com>
39+
40+ make sure to listen to the correct signal
41+
42+2012-03-06 Conor Curran <conor.curran@canonical.com>
43+
44+ listen for the right signal
45+
46 2012-02-23 Ted Gould <ted@gould.cx>
47
48 0.3.92
49
50=== modified file 'aclocal.m4'
51--- aclocal.m4 2012-02-23 14:55:02 +0000
52+++ aclocal.m4 2012-03-09 21:34:21 +0000
53@@ -543,7 +543,7 @@
54
55
56 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
57-# serial 41 IT_PROG_INTLTOOL
58+# serial 42 IT_PROG_INTLTOOL
59 AC_DEFUN([IT_PROG_INTLTOOL], [
60 AC_PREREQ([2.50])dnl
61 AC_REQUIRE([AM_NLS])dnl
62@@ -556,13 +556,11 @@
63 ;;
64 esac
65
66+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
67+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
68+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
69 if test -n "$1"; then
70 AC_MSG_CHECKING([for intltool >= $1])
71-
72- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
73- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
74- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
75- ]
76 AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
77 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
78 AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
79@@ -605,7 +603,11 @@
80 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
81 INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
82 INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
83+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
84 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
85+else
86+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
87+fi
88 INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
89 INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
90 INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
91
92=== modified file 'configure'
93--- configure 2012-02-23 14:55:02 +0000
94+++ configure 2012-03-09 21:34:21 +0000
95@@ -2774,7 +2774,7 @@
96
97 # Define the identity of the package.
98 PACKAGE=indicator-session
99- VERSION=0.3.92
100+ VERSION=0.3.93
101
102
103 cat >>confdefs.h <<_ACEOF
104@@ -4078,14 +4078,12 @@
105 ;;
106 esac
107
108+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
109+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
110+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
111 if test -n "0.35.0"; then
112 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
113 $as_echo_n "checking for intltool >= 0.35.0... " >&6; }
114-
115- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
116- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
117- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
118-
119 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
120 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
121 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
122@@ -4246,7 +4244,11 @@
123 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
124 INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
125 INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
126+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
127 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
128+else
129+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
130+fi
131 INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
132 INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
133 INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
134
135=== modified file 'configure.ac'
136--- configure.ac 2012-02-23 15:17:10 +0000
137+++ configure.ac 2012-03-09 21:34:21 +0000
138@@ -4,7 +4,7 @@
139 AC_PREREQ(2.53)
140
141 AM_CONFIG_HEADER(config.h)
142-AM_INIT_AUTOMAKE(indicator-session, 0.3.92)
143+AM_INIT_AUTOMAKE(indicator-session, 0.3.93)
144
145 AM_MAINTAINER_MODE
146
147
148=== modified file 'debian/changelog'
149--- debian/changelog 2012-03-09 12:39:48 +0000
150+++ debian/changelog 2012-03-09 21:34:21 +0000
151@@ -1,3 +1,11 @@
152+indicator-session (0.3.93-0ubuntu1~ppa1) precise; urgency=low
153+
154+ * New upstream release.
155+ * Reverting locking change from earlier releases
156+ * Working with PackageKit restart signals better
157+
158+ -- Ted Gould <ted@ubuntu.com> Fri, 09 Mar 2012 15:31:35 -0600
159+
160 indicator-session (0.3.92-0ubuntu3) precise; urgency=low
161
162 * Backport mvo's restart required fix, with the new aptdaemon that

Subscribers

People subscribed via source and target branches