[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 18:27:11 UTC 2017 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a05ab9f

The following commit has been merged in the master branch:
commit a05ab9f84100c9c92772f147d55ca777dd14f94a
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Dec 2 05:47:37 2016 +0100

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 plugins/battery/kdeconnect_battery.json                         | 2 +-
 plugins/clipboard/kdeconnect_clipboard.json                     | 2 +-
 plugins/findmyphone/kdeconnect_findmyphone.json                 | 2 +-
 plugins/lockdevice/kdeconnect_lockdevice.json                   | 2 +-
 plugins/mousepad/kdeconnect_mousepad.json                       | 2 +-
 plugins/mpriscontrol/kdeconnect_mpriscontrol.json               | 2 +-
 plugins/mprisremote/kdeconnect_mprisremote.json                 | 2 +-
 plugins/notifications/kdeconnect_notifications.json             | 2 +-
 plugins/pausemusic/kdeconnect_pausemusic.json                   | 2 +-
 plugins/ping/kdeconnect_ping.json                               | 2 +-
 plugins/remotecommands/kdeconnect_remotecommands.json           | 2 +-
 plugins/remotecontrol/kdeconnect_remotecontrol.json             | 2 +-
 plugins/runcommand/kdeconnect_runcommand.json                   | 2 +-
 plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 2 +-
 plugins/sendnotifications/kdeconnect_sendnotifications.json     | 2 +-
 plugins/sftp/kdeconnect_sftp.json                               | 2 +-
 plugins/share/kdeconnect_share.json                             | 2 +-
 plugins/telephony/kdeconnect_telephony.json                     | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json
index 18ce8c4..2baa448 100644
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@ -76,4 +76,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.battery"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json
index 273c7c9..abffb38 100644
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@ -76,4 +76,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.clipboard"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json
index c57a09f..6a59174 100644
--- a/plugins/findmyphone/kdeconnect_findmyphone.json
+++ b/plugins/findmyphone/kdeconnect_findmyphone.json
@@ -66,4 +66,4 @@
     "X-KdeConnect-OutgoingPackageType": [
         "kdeconnect.findmyphone.request"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index 371fe76..1c8c895 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -75,4 +75,4 @@
         "kdeconnect.lock.request", 
         "kdeconnect.lock"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json
index b3d8a34..bb502d8 100644
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@@ -73,4 +73,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mousepad.request"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
index 0695c2c..884775f 100644
--- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
+++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
@@ -76,4 +76,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mpris.request"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json
index e581caf..c61e444 100644
--- a/plugins/mprisremote/kdeconnect_mprisremote.json
+++ b/plugins/mprisremote/kdeconnect_mprisremote.json
@@ -59,4 +59,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mpris"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json
index 2a84b71..f5f4f64 100644
--- a/plugins/notifications/kdeconnect_notifications.json
+++ b/plugins/notifications/kdeconnect_notifications.json
@@ -64,4 +64,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.notification"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json
index 23cf0a9..3ad6003 100644
--- a/plugins/pausemusic/kdeconnect_pausemusic.json
+++ b/plugins/pausemusic/kdeconnect_pausemusic.json
@@ -73,4 +73,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.telephony"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json
index ef53a04..3bbc68e 100644
--- a/plugins/ping/kdeconnect_ping.json
+++ b/plugins/ping/kdeconnect_ping.json
@@ -59,4 +59,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.ping"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json
index 7c12422..d69c705 100644
--- a/plugins/remotecommands/kdeconnect_remotecommands.json
+++ b/plugins/remotecommands/kdeconnect_remotecommands.json
@@ -59,4 +59,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.runcommand"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index f034d8b..dd0b844 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -71,4 +71,4 @@
         "kdeconnect.mousepad.request"
     ], 
     "X-KdeConnect-SupportedPackageType": []
-}
\ No newline at end of file
+}
diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json
index dfe7c86..7767e90 100644
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@ -73,4 +73,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.runcommand.request"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
index 79d5615..c2f7e3a 100644
--- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
+++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
@@ -70,4 +70,4 @@
         "Version": "0.1", 
         "Website": "http://albertvaka.wordpress.com"
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json
index e540504..b64de92 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications.json
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json
@@ -64,4 +64,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.notification.request"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json
index 02be1c9..11d052d 100644
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@ -77,4 +77,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.sftp"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json
index 384e2ef..42a4eed 100644
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@@ -76,4 +76,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.share.request"
     ]
-}
\ No newline at end of file
+}
diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json
index 5968045..d6e16bc 100644
--- a/plugins/telephony/kdeconnect_telephony.json
+++ b/plugins/telephony/kdeconnect_telephony.json
@@ -69,4 +69,4 @@
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.telephony"
     ]
-}
\ No newline at end of file
+}

-- 
kdeconnect packaging

More information about the pkg-kde-commits mailing list