[SCM] oxygen packaging branch, kubuntu_vivid_backports, created. 2c599192398b9ef2d35693871fa73dec054a32b9

[Jonathan Riddell]

The branch, kubuntu_vivid_backports has been created
        at  2c599192398b9ef2d35693871fa73dec054a32b9 (commit)

- Shortlog ------------------------------------------------------------
commit 2c599192398b9ef2d35693871fa73dec054a32b9
Merge: f79f0e6 f18439d
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Thu Mar 26 12:22:02 2015 +0000

    Merging remotes/origin/kubuntu_stable into kubuntu_unstable.

commit f79f0e6d490f9b2cbecce05f6175c78f023aa516
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 13:20:36 2015 +0100

    repair the packaging. this was messed up so bad I want to quit

commit 424c722f6573aa24f0587e6a7b16968f34fd9b66
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 13:12:21 2015 +0100

    Revert "Fix stubvar external package for removed package."
    
    This reverts commit b0852946a066ba9ddd85826a08db072fe92db137.
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/plasma-theme-oxygen.install

commit 02b04be0e9d71c4dd0e890ff46ff21f4ac7baacc
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 13:11:28 2015 +0100

    Revert "Remove missing file."
    
    This reverts commit eaf0f3c632b55d026f15be1ca8fd8bf0927447a4.
    
    Conflicts:
    	debian/changelog

commit 551d3353d5041ade036a9124dcb73add86458ada
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 13:10:55 2015 +0100

    Revert "Re- remove kwin-decoration-oxygen package, it no longer builds"
    
    This reverts commit bfe98fba96650ef35c7a9574459b60d205e96de6.
    
    Conflicts:
    	debian/changelog
    	debian/control

commit f18439d822ba6581a0e5fc8681e14e18036b71c4
Merge: 11c8dee 8dff9f1
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 13:09:32 2015 +0100

    Merge branch 'kubuntu_vivid_archive' into kubuntu_stable

commit 2f0d8c2785c96f034865c2fe127da24e49215dfe
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Mar 25 00:25:38 2015 +0100

    add new files

-----------------------------------------------------------------------

-- 
oxygen packaging