1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167 | diff -Nru xfce4-power-manager-1.4.3/debian/changelog xfce4-power-manager-1.4.4/debian/changelog
--- xfce4-power-manager-1.4.3/debian/changelog 2015-03-01 12:19:42.000000000 +1100
+++ xfce4-power-manager-1.4.4/debian/changelog 2015-05-26 06:20:25.000000000 +1000
@@ -1,55 +1,56 @@
-xfce4-power-manager (1.4.3-0ubuntu1) vivid; urgency=medium
+xfce4-power-manager (1.4.4-4ubuntu1) wily; urgency=medium
- * New upstream release. LP: #1424887
-
- -- Jackson Doak <noskcaj@ubuntu.com> Sun, 01 Mar 2015 12:18:45 +1100
-
-xfce4-power-manager (1.4.2-0ubuntu5) vivid; urgency=medium
-
- * debian/patches/ll_integration.patch:
- Remove Enable/Disable, update logind-handle-lid-switch property.
+ * Merge from Debian. Remaining Ubuntu changes:
+ * debian/control
+ - Add libsystemd-login-dev build dep to use logind for session tracking.
+ - Enable building of lxpanel plugin
+ - Update depends for xfce4-power-manager-plugins to xfce4-panel | lxpanel
+ * debian/rules
+ - Do not include xfce4-panel in shlibs
- -- Sean Davis <smd.seandavis@gmail.com> Wed, 21 Jan 2015 06:59:19 -0500
+ -- Jackson Doak <noskcaj@ubuntu.com> Tue, 26 May 2015 06:20:12 +1000
-xfce4-power-manager (1.4.2-0ubuntu4) vivid; urgency=medium
+xfce4-power-manager (1.4.4-4) unstable; urgency=medium
- * debian/patches/ll_integration.patch:
- Also patch UI header file.
+ * debian/rules:
+ - use linux suspend/hibernate backend on Linux and Hurd, and freebsd on
+ kFreeBSD.
- -- Sean Davis <smd.seandavis@gmail.com> Fri, 09 Jan 2015 07:01:36 -0500
+ -- Yves-Alexis Perez <corsac@debian.org> Sat, 16 May 2015 10:32:12 +0200
-xfce4-power-manager (1.4.2-0ubuntu3) vivid; urgency=medium
+xfce4-power-manager (1.4.4-3) unstable; urgency=medium
- * debian/patches: Add ll_integration.patch, for light-locker
- integration in xfce4-power-manager-settings
+ * Upload to unstable.
- -- Sean Davis <smd.seandavis@gmail.com> Thu, 08 Jan 2015 22:36:37 -0500
+ -- Yves-Alexis Perez <corsac@debian.org> Wed, 06 May 2015 18:15:26 +0200
-xfce4-power-manager (1.4.2-0ubuntu2) vivid; urgency=medium
+xfce4-power-manager (1.4.4-2) experimental; urgency=medium
- * debian/control: Drop depends on systemd-services, virtual package
+ * debian/patches:
+ - 01_fix-light-locker-schema-loading added, make schema search recursive,
+ fix detection of light-locker settings.
- -- Sean Davis <smd.seandavis@gmail.com> Mon, 01 Dec 2014 22:30:33 -0500
+ -- Yves-Alexis Perez <corsac@debian.org> Thu, 23 Apr 2015 23:13:34 +0200
-xfce4-power-manager (1.4.2-0ubuntu1) vivid; urgency=medium
+xfce4-power-manager (1.4.4-1) experimental; urgency=medium
* New upstream release.
- * debian/patches: dropped, included upstream.
+ - the tray icon is back. closes: #755551
+ * debian/NEWS: add a note about the re-introduction of the tray icon.
- -- Sean Davis <smd.seandavis@gmail.com> Mon, 01 Dec 2014 21:47:51 -0500
+ -- Yves-Alexis Perez <corsac@debian.org> Sun, 22 Mar 2015 15:29:32 +0100
-xfce4-power-manager (1.4.1-2ubuntu1) vivid; urgency=medium
+xfce4-power-manager (1.4.3-1) experimental; urgency=medium
- * Merge from Debian. Remaining Ubuntu changes:
- * debian/control
- - Switch to using logind for session tracking. Depend on systemd-services
- and add libsystemd-login-dev build dependency.
- - Enable building of lxpanel plugin
- - Update depends for xfce4-power-manager-plugins to xfce4-panel | lxpanel
- * debian/rules
- - Do not include xfce4-panel in shlibs
+ * New upstream release.
+ - add symlinks for UPS icons. closes: #762500
+ * debian/patches:
+ - 0001-Use-translated-device-type-for-unknown-devices-bug-1 dropped,
+ included upstream.
+ * debian/control:
+ - drop libsystemd-daemon-dev build-dep, obsolete. closes: #779778
- -- Jackson Doak <noskcaj@ubuntu.com> Fri, 31 Oct 2014 18:36:56 +1100
+ -- Yves-Alexis Perez <corsac@debian.org> Sun, 08 Mar 2015 21:57:47 +0100
xfce4-power-manager (1.4.1-2) unstable; urgency=medium
diff -Nru xfce4-power-manager-1.4.3/debian/control xfce4-power-manager-1.4.4/debian/control
--- xfce4-power-manager-1.4.3/debian/control 2014-12-02 14:30:23.000000000 +1100
+++ xfce4-power-manager-1.4.4/debian/control 2015-05-26 06:23:30.000000000 +1000
@@ -8,8 +8,8 @@
libdbus-1-dev, libdbus-glib-1-dev, libxfconf-0-dev (>= 4.10.0),
libxfce4ui-1-dev (>= 4.10.0), libnotify-dev, xfce4-panel-dev (>= 4.10.0),
libpolkit-gobject-1-dev, libxext-dev, libx11-dev, dpkg-dev (>= 1.16.1),
- libsystemd-daemon-dev, libsystemd-login-dev, libupower-glib-dev (>= 0.99),
- lxpanel (>= 0.6.2-0ubuntu2), libmenu-cache-dev
+ libsystemd-login-dev, libupower-glib-dev (>= 0.99), lxpanel (>= 0.6.2-0ubuntu2),
+ libmenu-cache-dev
Standards-Version: 3.9.6
Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/desktop/trunk/xfce4-power-manager/
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/desktop/trunk/xfce4-power-manager/
diff -Nru xfce4-power-manager-1.4.3/debian/NEWS xfce4-power-manager-1.4.4/debian/NEWS
--- xfce4-power-manager-1.4.3/debian/NEWS 2014-10-31 23:21:53.000000000 +1100
+++ xfce4-power-manager-1.4.4/debian/NEWS 2015-03-23 01:36:24.000000000 +1100
@@ -1,2 +1,10 @@
+xfce4-power-manager (1.4.4-1) experimental; urgency=medium
+
+ Starting with version 1.4.4, the tray icon is now back and can be enabled in
+ the power manager settings.
+
+
+ -- Yves-Alexis Perez <corsac@debian.org> Sun, 22 Mar 2015 15:16:46 +0100
+
xfce4-power-manager (1.3.0-1) experimental; urgency=low
diff -Nru xfce4-power-manager-1.4.3/debian/patches/01_fix-light-locker-schema-loading.patch xfce4-power-manager-1.4.4/debian/patches/01_fix-light-locker-schema-loading.patch
--- xfce4-power-manager-1.4.3/debian/patches/01_fix-light-locker-schema-loading.patch 1970-01-01 10:00:00.000000000 +1000
+++ xfce4-power-manager-1.4.4/debian/patches/01_fix-light-locker-schema-loading.patch 2015-04-24 07:13:31.000000000 +1000
@@ -0,0 +1,13 @@
+diff --git a/settings/xfpm-settings.c b/settings/xfpm-settings.c
+index 5330065..a154775 100644
+--- a/settings/xfpm-settings.c
++++ b/settings/xfpm-settings.c
+@@ -1589,7 +1589,7 @@ static void xfpm_settings_light_locker (XfconfChannel *channel,
+ }
+
+ schema_source = g_settings_schema_source_get_default();
+- schema = g_settings_schema_source_lookup (schema_source, "apps.light-locker", FALSE);
++ schema = g_settings_schema_source_lookup (schema_source, "apps.light-locker", TRUE);
+
+ if (schema != NULL && get_light_locker_path() != NULL) {
+ security_frame = GTK_WIDGET (gtk_builder_get_object (xml, "security-frame"));
diff -Nru xfce4-power-manager-1.4.3/debian/patches/series xfce4-power-manager-1.4.4/debian/patches/series
--- xfce4-power-manager-1.4.3/debian/patches/series 2015-03-01 12:18:40.000000000 +1100
+++ xfce4-power-manager-1.4.4/debian/patches/series 2015-04-24 07:13:31.000000000 +1000
@@ -0,0 +1 @@
+01_fix-light-locker-schema-loading.patch
diff -Nru xfce4-power-manager-1.4.3/debian/rules xfce4-power-manager-1.4.4/debian/rules
--- xfce4-power-manager-1.4.3/debian/rules 2014-10-31 23:21:53.000000000 +1100
+++ xfce4-power-manager-1.4.4/debian/rules 2015-05-26 06:20:47.000000000 +1000
@@ -3,8 +3,12 @@
export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+BACKEND=linux
+ifeq ($(DEB_BUILD_ARCH_OS),kfreebsd)
+ BACKEND=freebsd
+endif
override_dh_auto_configure:
- dh_auto_configure -- --disable-silent-rules
+ dh_auto_configure -- --disable-silent-rules --with-backend=$(BACKEND)
override_dh_install:
find debian/tmp/usr/lib -name 'lib*.la' -delete
@@ -12,5 +16,6 @@
override_dh_shlibdeps:
dh_shlibdeps -- -xxfce4-panel
+
%:
dh $@ --parallel
|