Merge lp:~hanschun/ubuntu/wily/gnome-settings-daemon/fix-For-Bug-991577 into lp:ubuntu/wily/gnome-settings-daemon

[Hans Chun]

This is a fix for bug 991577.

This is a fix for bug 991577.

[Daniel Holbach (dholbach)]

I uploaded, your fix (https://launchpad.net/ubuntu/+source/gnome-settings-daemon/3.14.2-3ubuntu2), but couldn't upload it as is, because

 - the version you wanted to upload was based on 3.8.5-0ubuntu1
 - (minor) Bug#991577 should have been LP: #991577

Thanks a lot for your work in any case. I'll reject this merge proposal as it couldn't be just merged as it was.

Unmerged revisions

256. By Hans Chun on 2015-07-04

*debian/control: removed "Typing break" line Bug#991577
*debian/control.in: removed "Typing break" line Bug#991577

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-09-09 10:21:09 +0000
+++ .pc/applied-patches	2015-07-04 02:16:07 +0000
@@ -24,3 +24,4 @@
 git_revert_hardcoded_input_methods.patch
 ubuntu-fix-desktop-file.patch
 ubuntu-lid-close-suspend.patch
+typing-break-patch.patch

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-09 10:21:09 +0000
+++ debian/changelog	2015-07-04 02:16:07 +0000
@@ -1,3 +1,9 @@
+gnome-settings-daemon (3.8.5-0ubuntu2) UNRELEASED; urgency=medium
+  *debian/control: removed "Typing break" line Bug#991577
+  *debian/control.in: removed "Typing break" line Bug#991577
+ 
+ -- Hans Chun <[e-mail]>  Fri, 03 Jul 2015 19:10:13 -0700
+
 gnome-settings-daemon (3.8.5-0ubuntu1) saucy; urgency=low
 
   [ Tim Lunn ]

=== modified file 'debian/control'
--- debian/control	2013-09-09 10:21:09 +0000
+++ debian/control	2015-07-04 02:16:07 +0000
@@ -83,7 +83,6 @@
   * Cleanup of unused files
   * Mouse: cursors, speed, accessibility options
   * Startup of other daemons: screensaver, sound daemon
-  * Typing break
  .
  It also sets various application settings through X resources and
  freedesktop.org XSETTINGS.

=== modified file 'debian/control.in'
--- debian/control.in	2013-09-09 10:21:09 +0000
+++ debian/control.in	2015-07-04 02:16:07 +0000
@@ -79,7 +79,6 @@
   * Cleanup of unused files
   * Mouse: cursors, speed, accessibility options
   * Startup of other daemons: screensaver, sound daemon
-  * Typing break
  .
  It also sets various application settings through X resources and
  freedesktop.org XSETTINGS.

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-09-09 10:21:09 +0000
+++ debian/patches/series	2015-07-04 02:16:07 +0000
@@ -25,3 +25,4 @@
 git_revert_hardcoded_input_methods.patch
 ubuntu-fix-desktop-file.patch
 ubuntu-lid-close-suspend.patch
+typing-break-patch.patch