debian/patches: Drop 01_gnome_keyring.diff patch because is rejecting from README->configure.ac->data/org.mate.power.manager.gschema.xml.in patching->src/gpm-control.c
This commit is contained in:
Vangelis Mouhtsis
commit
b114490cb5
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,7 +1,7 @@
|
||||
mate-power-manager (1.8.0-1) UNRELEASED; urgency=low
|
||||
mate-power-manager (1.8.0-1.1) UNRELEASED; urgency=low
|
||||
|
||||
* Initial release. (Closes: #734868)
|
||||
* debian/watch:
|
||||
* debian/watch:
|
||||
+ Use tagged CGit tarball snapshots as upstream source.
|
||||
|
||||
-- Vangelis Mouhtsis <vangelis@gnugr.org> Sat, 19 Apr 2014 13:06:34 +0300
|
||||
-- Vangelis Mouhtsis <vangelis@gnugr.org> Mon, 21 Apr 2014 21:09:20 +0300
|
||||
|
||||
152
debian/patches/01_gnome_keyring.diff
vendored
152
debian/patches/01_gnome_keyring.diff
vendored
@ -1,152 +0,0 @@
|
||||
From 3a3d4125896f0704b3935b5a74baf063f31bedcf Mon Sep 17 00:00:00 2001
|
||||
From: raveit <chat-to-me@raveit.de>
|
||||
Date: Tue, 09 Jul 2013 11:48:41 +0000
|
||||
Subject: switch to gnome-keyring
|
||||
|
||||
---
|
||||
diff --git a/README b/README
|
||||
index 1483b66..4bf7626 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -15,7 +15,7 @@ To build, MATE Power Manager requires
|
||||
|
||||
- Glib (2.13.0 or later)
|
||||
- Gtk2+ (2.11.0 or later)
|
||||
- - MATE Keyring (1.1.0 or later)
|
||||
+ - GNOME Keyring (3.3.4 or later)
|
||||
- DBus (0.70 or later)
|
||||
- libmatenotify (1.1.0 or later)
|
||||
- Cairo (1.0.0 or later)
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3f9cb2e..2eff3d0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -102,7 +102,7 @@ GLIB_REQUIRED=2.13.0
|
||||
GIO_REQUIRED=2.25.0
|
||||
GTK_REQUIRED=2.17.7
|
||||
GDK_REQUIRED=2.11.0
|
||||
-MATE_KEYRING_REQUIRED=1.1.0
|
||||
+GNOME_KEYRING_REQUIRED=3.0.0
|
||||
DBUS_REQUIRED=1.0
|
||||
DBUS_GLIB_REQUIRED=0.70
|
||||
LIBNOTIFY_REQUIRED=0.7.0
|
||||
@@ -249,18 +249,18 @@ fi
|
||||
AM_CONDITIONAL([HAVE_TESTS], [test $have_tests = yes])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
-dnl - Build mate-keyring support
|
||||
+dnl - Build gnome-keyring support
|
||||
dnl ---------------------------------------------------------------------------
|
||||
AC_ARG_WITH(keyring,
|
||||
[AS_HELP_STRING([--without-keyring],
|
||||
- [Disable the use of mate-keyring])],
|
||||
+ [Disable the use of gnome-keyring])],
|
||||
[],
|
||||
[with_keyring=yes])
|
||||
|
||||
AM_CONDITIONAL([WITH_KEYRING],[test "$with_keyring" = "yes"])
|
||||
|
||||
if test "$with_keyring" = "yes"; then
|
||||
- PKG_CHECK_MODULES(KEYRING, mate-keyring-1 >= $MATE_KEYRING_REQUIRED)
|
||||
+ PKG_CHECK_MODULES(KEYRING, gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED)
|
||||
AC_DEFINE([WITH_KEYRING],[1],[Define if KEYRING support is enabled])
|
||||
fi
|
||||
|
||||
@@ -435,7 +435,7 @@ echo "
|
||||
datadir: ${datadir}
|
||||
compiler: ${CC}
|
||||
cflags: ${CFLAGS}
|
||||
- mate-keyring support: ${with_keyring}
|
||||
+ gnome-keyring support: ${with_keyring}
|
||||
Building extra applets: ${enable_applets}
|
||||
Self test support: ${have_tests}
|
||||
Use libunique: ${enable_libunique}
|
||||
diff --git a/data/org.mate.power-manager.gschema.xml.in b/data/org.mate.power-manager.gschema.xml.in
|
||||
index dcd2cd4..adecce0 100644
|
||||
--- a/data/org.mate.power-manager.gschema.xml.in
|
||||
+++ b/data/org.mate.power-manager.gschema.xml.in
|
||||
@@ -183,13 +183,13 @@
|
||||
</key>
|
||||
<key name="lock-keyring-suspend" type="b">
|
||||
<default>false</default>
|
||||
- <_summary>Lock MATE keyring on sleep</_summary>
|
||||
- <_description>Whether the MATE keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
|
||||
+ <_summary>Lock GNOME keyring on sleep</_summary>
|
||||
+ <_description>Whether the GNOME keyring is locked before the computer enters suspend. This means the keyring will have to be unlocked on resume.</_description>
|
||||
</key>
|
||||
<key name="lock-keyring-hibernate" type="b">
|
||||
<default>true</default>
|
||||
- <_summary>Lock MATE keyring on sleep</_summary>
|
||||
- <_description>Whether the MATE keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
|
||||
+ <_summary>Lock GNOME keyring on sleep</_summary>
|
||||
+ <_description>Whether the GNOME keyring is locked before the computer enters hibernate. This means the keyring will have to be unlocked on resume.</_description>
|
||||
</key>
|
||||
<key name="spindown-enable-ac" type="b">
|
||||
<default>false</default>
|
||||
diff --git a/src/gpm-control.c b/src/gpm-control.c
|
||||
index 71f857c..19b16db 100644
|
||||
--- a/src/gpm-control.c
|
||||
+++ b/src/gpm-control.c
|
||||
@@ -42,7 +42,7 @@
|
||||
#include <libupower-glib/upower.h>
|
||||
|
||||
#ifdef WITH_KEYRING
|
||||
-#include <mate-keyring.h>
|
||||
+#include <gnome-keyring.h>
|
||||
#endif /* WITH_KEYRING */
|
||||
|
||||
#include "egg-debug.h"
|
||||
@@ -163,8 +163,8 @@ gpm_control_suspend (GpmControl *control, GError **error)
|
||||
GpmScreensaver *screensaver;
|
||||
guint32 throttle_cookie = 0;
|
||||
#ifdef WITH_KEYRING
|
||||
- gboolean lock_mate_keyring;
|
||||
- MateKeyringResult keyres;
|
||||
+ gboolean lock_gnome_keyring;
|
||||
+ GnomeKeyringResult keyres;
|
||||
#endif /* WITH_KEYRING */
|
||||
#ifdef WITH_SYSTEMD_SLEEP
|
||||
GError *dbus_error = NULL;
|
||||
@@ -186,10 +186,10 @@ gpm_control_suspend (GpmControl *control, GError **error)
|
||||
|
||||
#ifdef WITH_KEYRING
|
||||
/* we should perhaps lock keyrings when sleeping #375681 */
|
||||
- lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
|
||||
- if (lock_mate_keyring) {
|
||||
- keyres = mate_keyring_lock_all_sync ();
|
||||
- if (keyres != MATE_KEYRING_RESULT_OK)
|
||||
+ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_SUSPEND);
|
||||
+ if (lock_gnome_keyring) {
|
||||
+ keyres = gnome_keyring_lock_all_sync ();
|
||||
+ if (keyres != GNOME_KEYRING_RESULT_OK)
|
||||
egg_warning ("could not lock keyring");
|
||||
}
|
||||
#endif /* WITH_KEYRING */
|
||||
@@ -274,8 +274,8 @@ gpm_control_hibernate (GpmControl *control, GError **error)
|
||||
GpmScreensaver *screensaver;
|
||||
guint32 throttle_cookie = 0;
|
||||
#ifdef WITH_KEYRING
|
||||
- gboolean lock_mate_keyring;
|
||||
- MateKeyringResult keyres;
|
||||
+ gboolean lock_gnome_keyring;
|
||||
+ GnomeKeyringResult keyres;
|
||||
#endif /* WITH_KEYRING */
|
||||
|
||||
#ifdef WITH_SYSTEMD_SLEEP
|
||||
@@ -298,10 +298,10 @@ gpm_control_hibernate (GpmControl *control, GError **error)
|
||||
|
||||
#ifdef WITH_KEYRING
|
||||
/* we should perhaps lock keyrings when sleeping #375681 */
|
||||
- lock_mate_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
|
||||
- if (lock_mate_keyring) {
|
||||
- keyres = mate_keyring_lock_all_sync ();
|
||||
- if (keyres != MATE_KEYRING_RESULT_OK) {
|
||||
+ lock_gnome_keyring = g_settings_get_boolean (control->priv->settings, GPM_SETTINGS_LOCK_KEYRING_HIBERNATE);
|
||||
+ if (lock_gnome_keyring) {
|
||||
+ keyres = gnome_keyring_lock_all_sync ();
|
||||
+ if (keyres != GNOME_KEYRING_RESULT_OK) {
|
||||
egg_warning ("could not lock keyring");
|
||||
}
|
||||
}
|
||||
--
|
||||
cgit
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -1 +1 @@
|
||||
01_gnome_keyring.diff
|
||||
|
||||
|
||||
4
debian/watch
vendored
4
debian/watch
vendored
@ -1,3 +1,7 @@
|
||||
version=3
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
opts=dversionmangle=s/\+dfsg1// \
|
||||
>>>>>>> d01ec962a4ae8edfcf4bfc83ed869dce8a77a10d
|
||||
http://git.mate-desktop.org/mate-power-manager/ \
|
||||
snapshot/mate-power-manager-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user