ubuntu/+source/kubuntu-notification-helper:applied/ubuntu/vivid-devel

Last commit made on 2015-04-01
Get this branch:
git clone -b applied/ubuntu/vivid-devel https://git.launchpad.net/ubuntu/+source/kubuntu-notification-helper
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/vivid-devel
Repository:
lp:ubuntu/+source/kubuntu-notification-helper

Recent commits

3a5d433... by Jonathan Riddell on 2015-04-01

Import patches-applied version 15.04ubuntu5 to applied/ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 9a8d2e3a75779f540bbbcce22eebeaff359c956a
Unapplied parent: a9ea5ceb4020deba6b3bfb869be5023e7c0e04fc

New changelog entries:
  * Fix up restricted install hook LP: #1439147
  * Fix up reboot event LP: #1439141

a9ea5ce... by Jonathan Riddell on 2015-04-01

Import patches-unapplied version 15.04ubuntu5 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 3886dc2b5d00d741829b36fb5843444397cbf5fe

New changelog entries:
  * Fix up restricted install hook LP: #1439147
  * Fix up reboot event LP: #1439141

9a8d2e3... by Harald Sitter on 2015-04-01

Import patches-applied version 15.04ubuntu4 to applied/ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 19a9af65e562e73a82894e793dc792cb83cf4047
Unapplied parent: 3886dc2b5d00d741829b36fb5843444397cbf5fe

New changelog entries:
  * Fix infinite recursion and language lookup in hooks LP: #1434226
    + New class Locale to rip apart an input locale and build possible
      language value combinations from it. This is needed as some hooks use
      the encoding as part of the language identifier, which the previous code
      entirely disregarded.
    + Fix inifinte recursion when reading hook fields that broke in the qt5
      port as two functions differing by argument were folded into one causing
      infinite recursion when trying to read the actual values out of the map.
    + Defer the actual reading from the map to QMap#value which is really what
      should have been used all along (use case: read value, but fall back to
      default if key is not present).
    + Introduce a simple test case for hook reading checking invalidity and
      validity and actually reading fields along with 2 localized versions in
      the formats I have seen in use.
    + Introduce a test case for the new locale class ensuring that locale
      parsing is working as well as combination construction is correct and
      returns a list with correct order.
  * Import translations from launchpad.
  * Fix kcmshell4 -> kcmshell5 call.

3886dc2... by Harald Sitter on 2015-04-01

Import patches-unapplied version 15.04ubuntu4 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 43cdf88e690c4f91c6a0537c98d43b0cad42f589

New changelog entries:
  * Fix infinite recursion and language lookup in hooks LP: #1434226
    + New class Locale to rip apart an input locale and build possible
      language value combinations from it. This is needed as some hooks use
      the encoding as part of the language identifier, which the previous code
      entirely disregarded.
    + Fix inifinte recursion when reading hook fields that broke in the qt5
      port as two functions differing by argument were folded into one causing
      infinite recursion when trying to read the actual values out of the map.
    + Defer the actual reading from the map to QMap#value which is really what
      should have been used all along (use case: read value, but fall back to
      default if key is not present).
    + Introduce a simple test case for hook reading checking invalidity and
      validity and actually reading fields along with 2 localized versions in
      the formats I have seen in use.
    + Introduce a test case for the new locale class ensuring that locale
      parsing is working as well as combination construction is correct and
      returns a list with correct order.
  * Import translations from launchpad.
  * Fix kcmshell4 -> kcmshell5 call.

19a9af6... by Jonathan Riddell on 2015-03-31

Import patches-applied version 15.04ubuntu3 to applied/ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 9dfbb1c434daa9d91dfbcc4cf45257d930a5b028
Unapplied parent: 43cdf88e690c4f91c6a0537c98d43b0cad42f589

New changelog entries:
  * Fix install paths
  * Fix .desktop file

43cdf88... by Jonathan Riddell on 2015-03-31

Import patches-unapplied version 15.04ubuntu3 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: d9b040baad10d7cca9723b695dd9c515fc445f9c

New changelog entries:
  * Fix install paths
  * Fix .desktop file

9dfbb1c... by Harald Sitter on 2015-03-26

Import patches-applied version 15.04ubuntu2 to applied/ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 5b40d5989cedca0bdbe8ae7018f2cd72ef252c38
Unapplied parent: d9b040baad10d7cca9723b695dd9c515fc445f9c

New changelog entries:
  * Set library translation domain for kded and kcm so that translations are
    actually loaded.

d9b040b... by Harald Sitter on 2015-03-26

Import patches-unapplied version 15.04ubuntu2 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 0f0ef6180bcf94ce9191c95bb968e81d4e78cf9a

New changelog entries:
  * Set library translation domain for kded and kcm so that translations are
    actually loaded.

5b40d59... by Harald Sitter on 2015-01-21

Import patches-applied version 15.04ubuntu1 to applied/ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 872d37af6d27759340917e2f0b68d762fea81453
Unapplied parent: 0f0ef6180bcf94ce9191c95bb968e81d4e78cf9a

New changelog entries:
  * KDE Frameworks 5 port

0f0ef61... by Harald Sitter on 2015-01-21

Import patches-unapplied version 15.04ubuntu1 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 338170fa9a5bceddaa2acbdc9b83a93510682d1d

New changelog entries:
  * KDE Frameworks 5 port