[SCM] oxygen-icons5 packaging branch, kubuntu_wily_backports, updated. 2f51bb36e67e3cb0d7237edbcc2c98ba28da81f0

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/oxygen-icons5.git;a=commitdiff;h=59e6f28

The following commit has been merged in the kubuntu_wily_backports branch:
commit 59e6f2877a10578dda0d5cfbfc77b2b8adf8b07b
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Jan 11 16:11:47 2016 +0100

    Add a transitional package for oxygen-icon-theme
---
 debian/changelog |  2 +-
 debian/control   | 13 +++++++++++--
 debian/rules     |  6 ++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b503648..829896e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ oxygen-icons5 (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
   * Build-depend on extra-cmake-modules, qtbase5-dev
   * Rename the binary to oxygen5-icon-theme and break/replace/provide
     oxygen-icon-theme
-  * New upstream release
+  * Add a transitional package for oxygen-icon-theme
 
  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:11:05 +0100
 
diff --git a/debian/control b/debian/control
index 6ece5f9..f7651d2 100644
--- a/debian/control
+++ b/debian/control
@@ -19,11 +19,20 @@ Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/frameworks/oxygen-icons5.git/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/oxygen-icons5.git
 
+Package: oxygen-icon-theme
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: oxygen5-icon-theme, ${misc:Depends}
+Description: Transitional package for oxygen5-icon-theme
+ This is a transitional package for oxygen5-icon-theme and can safely be
+ removed after installation.
+
 Package: oxygen5-icon-theme
 Architecture: all
 Depends: hicolor-icon-theme, ${misc:Depends}
-Breaks: oxygen-icon-theme
-Replaces: oxygen-icon-theme
+Breaks: oxygen-icon-theme (<< 5:5.5.3)
+Replaces: oxygen-icon-theme (<< 5:5.5.3)
 Provides: oxygen-icon-theme
 Description: Oxygen icon theme
  Oxygen is the standard icon theme for KDE 4, but follows the freedesktop.org
diff --git a/debian/rules b/debian/rules
index 7655b11..e556533 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,15 @@
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's/^[0-9]*://')
+
 override_dh_auto_install:
 	$(overridden_command) --destdir=debian/tmp
 
+override_dh_gencontrol:
+	dh_gencontrol -poxygen-icon-theme -- -v5:$(DEB_VERSION_UPSTREAM_REVISION)
+	dh_gencontrol --remaining-packages
+
 override_dh_install:
 	$(overridden_command)
 	find $(CURDIR)/debian/oxygen5-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty

-- 
oxygen-icons5 packaging