[SCM] okular packaging branch, master, updated. debian/16.08.2-1-75-g412778f

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:16:58 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/okular.git;a=commitdiff;h=0f8aa45

The following commit has been merged in the master branch:
commit 0f8aa4503cbbeaa8117d650297a3735498684c9e
Author: Neon CI <neon at kde.org>
Date:   Fri Apr 14 14:31:49 2017 +0200

    Mass conflict/break kde-l10n < 17.03.90 [part 2]
    
    In Applications 17.03.90 for all KF5 based applications the translations moved
    from the separate kde-l10n-$lang packages to the respective application tarball.
    
    To aid in a smooth transition we mass confict unsuitably old versions using
    the l10n-packages.mk's ${kde-l10n:all} substvar.
    
    This change was done by a bot trying to only introduce a relationship iff
    a binary package actually contains locales.
    
    This changes applies more accurate heuristics to cover more binary packages.
---
 debian/control | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 800fe32..fde9e9a 100644
--- a/debian/control
+++ b/debian/control
@@ -78,8 +78,9 @@ Suggests: ghostscript,
           unrar
 Provides: pdf-viewer, postscript-viewer
 Breaks: kdegraphics-mobipocket (<< 4:4.12),
-        okular-extra-backends (<< 4:16.12.0)
-Replaces: okular-extra-backends (<< 4:16.12.0)
+        okular-extra-backends (<< 4:16.12.0),
+        ${kde-l10n:all}
+Replaces: okular-extra-backends (<< 4:16.12.0), ${kde-l10n:all}
 Description: universal document viewer
  Okular is a universal document viewer with support for advanced document
  features, such as annotations, forms, and embedded files.
@@ -111,8 +112,8 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: okular
 Provides: djvu-viewer
-Breaks: okular (<< 4:16.12.0)
-Replaces: okular (<< 4:16.12.0)
+Breaks: okular (<< 4:16.12.0), ${kde-l10n:all}
+Replaces: okular (<< 4:16.12.0), ${kde-l10n:all}
 Description: additional document format support for Okular
  These plugins allow Okular to view additional document formats:
   * Portable Document Format (PDF)

-- 
okular packaging



More information about the pkg-kde-commits mailing list