[SCM] oxygen packaging branch, master, updated. e2e40fd4a13a2c88103e27bc423ae26e420d6a72

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6f9a13b9e2dd7046f2d1ea340ce226e8961feeae
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 8 16:56:17 2015 +0100

    Also build the qt4 version.
---
 debian/changelog                    |  1 +
 debian/control                      | 19 +++++++++++++++----
 debian/kde-style-oxygen-qt4.install |  9 +++++++++
 debian/rules                        | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b54f5d2..0206f19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ oxygen (4:5.2.0-1~) UNRELEASED; urgency=medium
   * Update build dependencies to build against experimental and to
     follow cmake.
   * Add myself as Uploader.
+  * Also build the qt4 version.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 08 Feb 2015 16:11:00 +0100
 
diff --git a/debian/control b/debian/control
index 905c312..7c8628a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
                extra-cmake-modules (>= 1.3.0~),
-               kwin-dev (>= 4:5.2.0),
                kdelibs5-dev (>= 4.9.80),
+               kwin-dev (>= 4:5.2.0),
                libkf5completion-dev (>= 5.2.0),
                libkf5config-dev (>= 5.2.0),
                libkf5guiaddons-dev (>= 5.2.0),
@@ -29,9 +29,9 @@ 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,
-         oxygen-sounds,
+Depends: kde-style-oxygen-qt4 (= ${binary:Version}),
+         kde-style-oxygen-qt5 (= ${binary:Version}),
+         oxygen-sounds (= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Breaks: oxygen-look-and-feel
@@ -57,6 +57,17 @@ Description: Qt decoration for the Oxygen desktop theme
  .
  This package contains the Qt 5 widget theme.
 
+Package: kde-style-oxygen-qt4
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kde-style-oxygen
+Replaces: kde-style-oxygen
+Description: Qt 4 decoration for the Oxygen desktop theme
+ The Oxygen desktop theme is used by Plasma and other KDE Software.
+ .
+ This is the version shipped with Plasma 5. This package contains the
+ Qt 4 widget theme.
+
 Package: liboxygenstyle5-5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/kde-style-oxygen-qt4.install b/debian/kde-style-oxygen-qt4.install
new file mode 100644
index 0000000..a3569cb
--- /dev/null
+++ b/debian/kde-style-oxygen-qt4.install
@@ -0,0 +1,9 @@
+/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
+/usr/lib/liboxygenstyle.so.5.*
+/usr/lib/liboxygenstyleconfig.so.5
+/usr/lib/liboxygenstyleconfig.so.5.*
+/usr/share/kde4/apps/kstyle/themes/oxygen.themerc
diff --git a/debian/rules b/debian/rules
index da23512..de35959 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,21 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
+override_dh_auto_clean:
+	$(overridden_command) --builddirectory=build-qt4
+	$(overridden_command)
+
+override_dh_auto_configure:
+	$(overridden_command) --builddirectory=build-qt4 -- -DUSE_KDE4=true
+	$(overridden_command)
+
+override_dh_auto_build:
+	$(overridden_command) --builddirectory=build-qt4
+	$(overridden_command)
+
+override_dh_auto_install:
+	$(overridden_command) --builddirectory=build-qt4
+	$(overridden_command)
+
 override_dh_strip:
 	$(overridden_command) --dbg-package=oxygen-dbg

-- 
oxygen packaging