[SCM] oxygen packaging branch, master, updated. debian/5.3.2-4-4-gac77a46

Maximiliano Curia maxy at moszumanska.debian.org
Fri Sep 4 09:07:43 UTC 2015


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

The following commit has been merged in the master branch:
commit ec3115357300cc9b5252e936be0e5a28641b2153
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Sep 4 10:14:00 2015 +0200

    Add missing build dep.
---
 debian/changelog                      | 1 +
 debian/control                        | 7 +++----
 debian/kde-style-oxygen-qt4.install   | 1 -
 debian/kde-style-oxygen-qt5.install   | 1 -
 debian/kwin-decoration-oxygen.install | 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c1cdc9..fbcf5ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 oxygen (4:5.4.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.4.0).
+  * Update install files.
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Sep 2015 23:50:40 +0200
 
diff --git a/debian/control b/debian/control
index cb6071d..9076d5c 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5coreaddons-dev,
                libkf5guiaddons-dev (>= 5.2.0),
                libkf5i18n-dev (>= 5.2.0),
+               libkf5kcmutils-dev,
                libkf5service-dev (>= 5.2.0),
                libkf5style-dev (>= 5.2.0),
                libkf5widgetsaddons-dev (>= 5.2.0),
@@ -100,10 +101,8 @@ Description: style library for the Oxygen desktop theme
 Package: liboxygenstyleconfig5-5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kde-style-oxygen-qt5 (<< 4:5.3.2-2~),
-        ${kde-l10n:all}
-Replaces: kde-style-oxygen-qt5 (<< 4:5.3.2-2~),
-          ${kde-l10n:all}
+Breaks: kde-style-oxygen-qt5 (<< 4:5.3.2-2~), ${kde-l10n:all}
+Replaces: kde-style-oxygen-qt5 (<< 4:5.3.2-2~), ${kde-l10n:all}
 Description: style library configuration for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
  .
diff --git a/debian/kde-style-oxygen-qt4.install b/debian/kde-style-oxygen-qt4.install
index a3569cb..f86e8c8 100644
--- a/debian/kde-style-oxygen-qt4.install
+++ b/debian/kde-style-oxygen-qt4.install
@@ -1,5 +1,4 @@
 /usr/bin/oxygen-demo
-/usr/bin/oxygen-settings
 /usr/lib/kde4/kstyle_oxygen_config.so
 /usr/lib/kde4/plugins/styles/oxygen.so
 /usr/lib/liboxygenstyle.so.5
diff --git a/debian/kde-style-oxygen-qt5.install b/debian/kde-style-oxygen-qt5.install
index b3deb4c..bc8ac30 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -1,4 +1,3 @@
-usr/bin/oxygen-settings5
 usr/lib/*/qt5/plugins/kstyle_oxygen_config.so
 usr/lib/*/qt5/plugins/styles/oxygen.so
 usr/share/kstyle/themes/oxygen.themerc
diff --git a/debian/kwin-decoration-oxygen.install b/debian/kwin-decoration-oxygen.install
index 8e019bf..e6ae008 100644
--- a/debian/kwin-decoration-oxygen.install
+++ b/debian/kwin-decoration-oxygen.install
@@ -1,3 +1,4 @@
 usr/lib/*/qt5/plugins/org.kde.kdecoration2/oxygendecoration.so
+usr/share/kservices5/oxygendecorationconfig.desktop
 usr/share/locale/*/*/oxygen_kdecoration.mo
 usr/share/locale/*/*/oxygen_kwin_deco.mo

-- 
oxygen packaging



More information about the pkg-kde-commits mailing list