[SCM] oxygen packaging branch, kubuntu_vivid_archive, updated. b0852946a066ba9ddd85826a08db072fe92db137

Scarlett Clark sgclark-guest at moszumanska.debian.org
Sun Mar 22 19:53:00 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/oxygen.git;a=commitdiff;h=b085294

The following commit has been merged in the kubuntu_vivid_archive branch:
commit b0852946a066ba9ddd85826a08db072fe92db137
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sun Mar 22 12:50:57 2015 -0700

    Fix stubvar external package for removed package.
---
 debian/changelog                   | 1 +
 debian/control                     | 5 ++---
 debian/plasma-theme-oxygen.install | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9d62c1a..e7955a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ oxygen (4:5.2.2-0ubuntu1) UNRELEASED; urgency=medium
     kwin-decoration-oxygen package being removed. 
   * Re- remove kwin-decoration-oxygen package, it no longer builds
   * Remove missing file. 
+  * Fix stubvar external package for removed package. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 19 Mar 2015 15:12:01 -0700
 
diff --git a/debian/control b/debian/control
index 429c4cc..adc6882 100644
--- a/debian/control
+++ b/debian/control
@@ -36,8 +36,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/oxygen.git
 Package: plasma-theme-oxygen
 Architecture: any
 Depends: kde-style-oxygen-qt4,
-         kde-style-oxygen-qt5,
-         kwin-decoration-oxygen,
+         kde-style-oxygen-qt5,        
          oxygen-sounds,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -94,7 +93,7 @@ Package: oxygen-dbg
 Section: debug
 Architecture: any
 Recommends: qtbase5-dbg
-Depends: liboxygenstyleconfig5-5 (= ${binary:Version}) | liboxygenstyle5-5 (= ${binary:Version}) | kde-style-oxygen-qt5 (= ${binary:Version}) | kwin-decoration-oxygen (= ${binary:Version}),
+Depends: liboxygenstyleconfig5-5 (= ${binary:Version}) | liboxygenstyle5-5 (= ${binary:Version}) | kde-style-oxygen-qt5 (= ${binary:Version}), 
          ${misc:Depends}
 Description: debugging symbols for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
diff --git a/debian/plasma-theme-oxygen.install b/debian/plasma-theme-oxygen.install
index 55d86ed..a5e753e 100644
--- a/debian/plasma-theme-oxygen.install
+++ b/debian/plasma-theme-oxygen.install
@@ -1,4 +1,3 @@
-
 usr/share/plasma/look-and-feel/org.kde.oxygen/contents/defaults
 usr/share/plasma/look-and-feel/org.kde.oxygen/contents/previews/preview.png
 usr/share/plasma/look-and-feel/org.kde.oxygen/contents/previews/splash.png

-- 
oxygen packaging



More information about the pkg-kde-commits mailing list