[SCM] oxygen-icons5 packaging branch, master, updated. debian/5.23.0-1-8-g1cac0f8

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit da48bd251603f2d304f8e286732b2decee6c7840
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 31 17:11:57 2016 +0200

    rename oxygen5-icon-theme back to oxygen-icon-theme
    
    it is the name of the icon theme:
    - add proper breaks/replaces
    - add oxygen5-icon-theme as transitional package
---
 debian/changelog                                        |  4 ++++
 debian/control                                          | 17 +++++++++++++----
 ...en5-icon-theme.install => oxygen-icon-theme.install} |  0
 debian/rules                                            |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51b75c4..1cfb41c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ oxygen-icons5 (5:5.24.0-0r1) UNRELEASED; urgency=medium
   * Bump extra-cmake-modules build dependency to 5.24.0~.
   * Add 5 as epoch, so the binaries can take over older binaries from
     src:oxygen-icons.
+  * Rename oxygen5-icon-theme back to oxygen-icon-theme, since it is the name
+    of the icon theme:
+    - add proper breaks/replaces
+    - add oxygen5-icon-theme as transitional package
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 16:29:12 +0200
 
diff --git a/debian/control b/debian/control
index 9951fde..1253dec 100644
--- a/debian/control
+++ b/debian/control
@@ -19,13 +19,22 @@ Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/oxygen-icons5.git/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/oxygen-icons5.git
 
-Package: oxygen5-icon-theme
+Package: oxygen-icon-theme
 Architecture: all
 Depends: hicolor-icon-theme, ${misc:Depends}
-Breaks: fdpowermon-icons, oxygen-icon-theme
-Replaces: fdpowermon-icons, oxygen-icon-theme
-Provides: oxygen-icon-theme
+Breaks: fdpowermon-icons, oxygen5-icon-theme (<< 5:5.24.0)
+Replaces: fdpowermon-icons, oxygen5-icon-theme (<< 5:5.24.0)
 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
  specification.
+
+Package: oxygen5-icon-theme
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, oxygen-icon-theme (>= ${source:Version})
+Description: transitional package for oxygen-icon-theme
+ This is a transitional package for oxygen-icon-theme.
+ .
+ It can be safely removed after the upgrade.
diff --git a/debian/oxygen5-icon-theme.install b/debian/oxygen-icon-theme.install
similarity index 100%
rename from debian/oxygen5-icon-theme.install
rename to debian/oxygen-icon-theme.install
diff --git a/debian/rules b/debian/rules
index af55982..0b53015 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,11 +7,11 @@ override_dh_auto_install:
 
 override_dh_install-indep:
 	$(overridden_command)
-	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
+	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
 
 	set -e && for size in 256 128 64 48 32 22 16; do \
-		package="oxygen5-icon-theme"; \
+		package="oxygen-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