Public Pastes
daily pastebin goal
51%
SHARE
TWEET

Untitled

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