[SCM] oxygen-icons5 packaging branch, kubuntu_xenial_archive, updated. a57a7c4b7b3ae4eacefc9c6be987b89681134d58

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 9ded8d46cfd0ae55c5f7bebf387118db65ed831d
Author: Philip Muškovac <yofel at gmx.net>
Date:   Wed Jan 6 05:59:08 2016 +0100

    Rename the binary to oxygen5-icon-theme and break/replace/provide oxygen-icon-theme
---
 debian/changelog |  4 ++--
 debian/control   |  5 ++++-
 debian/rules     | 11 +++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39c67e4..f3eb072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,8 @@ oxygen-icons5 (5.17.0-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream release, for kf5
   * Port watch file to new download location 
   * Build-depend on extra-cmake-modules, qtbase5-dev
-  * Add an epoch of 5 to oxygen-icon-theme to allow upgrades from the previous
-    version
+  * Rename the binary to oxygen5-icon-theme and break/replace/provide
+    oxygen-icon-theme
 
  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 05 Jan 2016 20:56:26 +0100
 
diff --git a/debian/control b/debian/control
index ade76b7..f5b4221 100644
--- a/debian/control
+++ b/debian/control
@@ -19,9 +19,12 @@ 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
+Package: oxygen5-icon-theme
 Architecture: all
 Depends: hicolor-icon-theme, ${misc:Depends}
+Breaks: oxygen-icon-theme (<< 5.17~)
+Replaces: oxygen-icon-theme (<< 5.17~)
+Provides: oxygen-icon-theme
 Description: Oxygen icon theme
  Oxygen is the standard icon theme for KDE 4, but follows the freedesktop.org
  icon schemes, so it can be used in other desktop environments using this
diff --git a/debian/rules b/debian/rules
index 05543b5..7655b11 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,21 +2,16 @@
 
 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}
-
 override_dh_install:
 	$(overridden_command)
-	find $(CURDIR)/debian/oxygen-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty
-	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/oxygen-icon-theme $(CURDIR)/debian/oxygen-icon-theme/usr/share/icons
+	find $(CURDIR)/debian/oxygen5-icon-theme -type d -print0 |xargs -0 rmdir --ignore-fail-on-non-empty
+	bash $(CURDIR)/debian/symlink_duplicates.sh $(CURDIR)/debian/oxygen5-icon-theme $(CURDIR)/debian/oxygen5-icon-theme/usr/share/icons
 
 	set -e && for size in 256 128 64 48 32 22 16; do \
-		package="oxygen-icon-theme"; \
+		package="oxygen5-icon-theme"; \
 		mkdir -p debian/$${package}/usr/share/icons/hicolor/$${size}x$${size}/apps; \
 		for icon in device-notifier kde kde-windows klipper korgac kpgp krdc krfb ktip nepomuk oxygen plasma strigi; do \
 			if [ -e debian/$${package}/usr/share/icons/oxygen/$${size}x$${size}/apps/$${icon}.png ]; then \

-- 
oxygen-icons5 packaging