[SCM] oxygen packaging branch, master, updated. ubuntu/4%5.3.2-0ubuntu1-12-g6ab4a80

Maximiliano Curia maxy at moszumanska.debian.org
Fri Jul 3 11:47:23 UTC 2015


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

The following commit has been merged in the master branch:
commit 6ab4a8041fc8ad609911f5bbe8c1773909aabc38
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 3 13:47:04 2015 +0200

    Add the missing Breaks/Replaces.
---
 debian/changelog | 2 +-
 debian/control   | 8 +++++---
 debian/rules     | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71fa141..b833477 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 oxygen (4:5.3.2-3~) UNRELEASED; urgency=medium
 
-  * 
+  * Add the missing Breaks/Replaces.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 03 Jul 2015 13:33:27 +0200
 
diff --git a/debian/control b/debian/control
index 6be6f22..a2639b0 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: cmake (>= 2.8.12),
                libx11-dev,
                libxcb1-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               pkg-kde-tools (>= 0.15.18~),
                qtbase5-dev (>= 5.4)
 Standards-Version: 3.9.6
 Homepage: https://projects.kde.org/projects/kde/workspace/oxygen
@@ -100,8 +100,10 @@ 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~)
-Replaces: kde-style-oxygen-qt5 (<< 4:5.3.2-2~)
+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/rules b/debian/rules
index de35959..38fa806 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+l10npkgs_firstversion_ok := 4:4.14.0-2
+
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_auto_clean:
 	$(overridden_command) --builddirectory=build-qt4

-- 
oxygen packaging



More information about the pkg-kde-commits mailing list