[Pkg-cli-apps-commits] [docky] 03/04: Drop 00bzr_logind-suspend-hibernate.diff and use_dbussharp_2.patch

[Rico Tzschichholz]

This is an automated email from the git hooks/post-receive script.

ricotz-guest pushed a commit to branch master
in repository docky.

commit 9d5e629dcbbb74bee0103486cc2023cba0c6a23e
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Wed Sep 2 12:47:18 2015 +0200

    Drop 00bzr_logind-suspend-hibernate.diff and use_dbussharp_2.patch
---
 debian/patches/00bzr_logind-suspend-hibernate.diff | 69 ----------------------
 debian/patches/series                              |  2 -
 debian/patches/use_dbussharp_2.patch               | 15 -----
 3 files changed, 86 deletions(-)

diff --git a/debian/patches/00bzr_logind-suspend-hibernate.diff b/debian/patches/00bzr_logind-suspend-hibernate.diff
deleted file mode 100644
index afd84e8..0000000
--- a/debian/patches/00bzr_logind-suspend-hibernate.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Use logind for suspend and hibernate too
-Origin: upstream, https://bazaar.launchpad.net/~docky-core/docky/trunk/revision/1841
-
-=== modified file 'StandardPlugins/SessionManager/src/SystemManager.cs'
---- a/StandardPlugins/SessionManager/src/SystemManager.cs	2012-12-31 04:25:57 +0000
-+++ b/StandardPlugins/SessionManager/src/SystemManager.cs	2013-05-02 16:08:57 +0000
-@@ -86,11 +86,15 @@
- 		[Interface (SystemdIface)]
- 		interface ISystemd
- 		{
-+			string CanHibernate ();
-+			string CanSuspend ();
- 			string CanPowerOff ();
- 			string CanReboot ();
- 
- 			void PowerOff (bool interactive);
- 			void Reboot (bool interactive);
-+			void Suspend (bool interactive);
-+			void Hibernate (bool interactive);
- 		}
- 
- 		[Interface (ConsoleKitIface)]
-@@ -212,7 +216,9 @@
- 		
- 		public bool CanHibernate ()
- 		{
--			if (upower != null)
-+			if (systemd != null)
-+				return String.Equals (systemd.CanHibernate (), "yes");
-+			else if (upower != null)
- 				return GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ();
- 			else if (devicekit != null)
- 				return GetBoolean (devicekit, DeviceKitPowerName, "CanHibernate");
-@@ -223,7 +229,10 @@
- 
- 		public void Hibernate ()
- 		{
--			if (upower != null) {
-+			if (systemd != null) {
-+				if (String.Equals (systemd.CanHibernate (), "yes"))
-+					systemd.Hibernate (true);
-+			} else if (upower != null) {
- 				if (GetBoolean (upower, UPowerName, "CanHibernate") && upower.HibernateAllowed ())
- 					upower.Hibernate ();
- 			} else if (devicekit != null) {
-@@ -236,7 +245,9 @@
- 
- 		public bool CanSuspend ()
- 		{
--			if (upower != null)
-+			if (systemd != null)
-+				return String.Equals (systemd.CanSuspend (), "yes");
-+			else if (upower != null)
- 				return GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ();
- 			else if (devicekit != null)
- 				return GetBoolean (devicekit, DeviceKitPowerName, "CanSuspend");
-@@ -247,7 +258,10 @@
- 
- 		public void Suspend ()
- 		{
--			if (upower != null) {
-+			if (systemd != null) {
-+				if (String.Equals (systemd.CanSuspend (), "yes"))
-+					systemd.Suspend (true);
-+			} else if (upower != null) {
- 				if (GetBoolean (upower, UPowerName, "CanSuspend") && upower.SuspendAllowed ())
- 					upower.Suspend ();
- 			} else if (devicekit != null) {
-
diff --git a/debian/patches/series b/debian/patches/series
index e614a8f..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-00bzr_logind-suspend-hibernate.diff
-use_dbussharp_2.patch
diff --git a/debian/patches/use_dbussharp_2.patch b/debian/patches/use_dbussharp_2.patch
deleted file mode 100644
index 65a1c4d..0000000
--- a/debian/patches/use_dbussharp_2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: docky/configure.ac
-===================================================================
---- docky.orig/configure.ac	2013-05-27 15:12:33.118408815 +0100
-+++ docky/configure.ac	2013-10-30 16:59:55.941769908 +0000
-@@ -90,8 +90,8 @@
- PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
- PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
- PKG_CHECK_MODULES([MONO_CAIRO], [mono-cairo])
--PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-1.0 >= $DBUS_SHARP_REQUIRED_VERSION])
--PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQUIRED_VERSION])
-+PKG_CHECK_MODULES([DBUS_SHARP_10], [dbus-sharp-2.0 >= $DBUS_SHARP_REQUIRED_VERSION])
-+PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-2.0 >= $DBUS_SHARP_GLIB_REQUIRED_VERSION])
- PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
- PKG_CHECK_MODULES([WNCK_SHARP_10], [wnck-sharp-1.0])
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/docky.git