[SCM] okular packaging branch, master, updated. debian/4.11.5-1

Maximiliano Curia maxy at moszumanska.debian.org
Fri Jan 24 13:12:52 UTC 2014 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/okular.git;a=commitdiff;h=52c281f

The following commit has been merged in the master branch:
commit 52c281f9b60fe056188fe973b469e2399077c214
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jan 23 19:27:40 2014 -0300

    wrap-and-sort
---
 debian/control        | 61 +++++++++++++++++++++++++++++----------------------
 debian/copyright      | 14 ++++++------
 debian/okular.install |  6 ++---
 3 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/debian/control b/debian/control
index c60e639..6faa70f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,25 +2,26 @@ Source: okular
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Eshat Cakar <info at eshat.de>,
- Maximiliano Curia <maxy at debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.11),
- cmake, debhelper (>= 9), pkg-kde-tools (>= 0.14),
- kdelibs5-dev (>= 4:4.11),
- pkg-config,
- libkactivities-dev (>= 4:4.11),
- libdjvulibre-dev,
- libepub-dev,
- libpoppler-qt4-dev (>= 0.8.0),
- libqca2-dev,
- libqimageblitz-dev,
- libspectre-dev,
- libtiff-dev,
- libx11-dev,
- libchm-dev,
- libjpeg-dev,
- libfreetype6-dev,
- zlib1g-dev
+Uploaders: Eshat Cakar <info at eshat.de>, Maximiliano Curia <maxy at debian.org>
+Build-Depends: cmake,
+               debhelper (>= 9),
+               kde-sc-dev-latest (>= 4:4.11),
+               kdelibs5-dev (>= 4:4.11),
+               libchm-dev,
+               libdjvulibre-dev,
+               libepub-dev,
+               libfreetype6-dev,
+               libjpeg-dev,
+               libkactivities-dev (>= 4:4.11),
+               libpoppler-qt4-dev (>= 0.8.0),
+               libqca2-dev,
+               libqimageblitz-dev,
+               libspectre-dev,
+               libtiff-dev,
+               libx11-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.14),
+               zlib1g-dev
 Standards-Version: 3.9.5
 XS-Testsuite: autopkgtest
 Homepage: http://www.kde.org/
@@ -30,7 +31,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-sc/okular.git
 Package: libokularcore3
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: libraries for the Okular document viewer
  This package contains libraries used by the Okular document viewer.
  .
@@ -39,8 +40,15 @@ Description: libraries for the Okular document viewer
 Package: okular
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libokularcore3 (= ${binary:Version})
-Suggests: okular-extra-backends (= ${binary:Version}), texlive-binaries, unrar, poppler-data, ghostscript, jovie
+Depends: libokularcore3 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: ghostscript,
+          jovie,
+          okular-extra-backends (= ${binary:Version}),
+          poppler-data,
+          texlive-binaries,
+          unrar
 Provides: pdf-viewer, postscript-viewer
 Description: universal document viewer
  Okular is a universal document viewer with support for advanced document
@@ -61,8 +69,9 @@ Description: universal document viewer
 Package: okular-dev
 Section: libdevel
 Architecture: any
-Depends: libokularcore3 (= ${binary:Version}), ${misc:Depends},
- ${sameVersionDep:kdelibs5-dev:libokularcore3}
+Depends: libokularcore3 (= ${binary:Version}),
+         ${misc:Depends},
+         ${sameVersionDep:kdelibs5-dev:libokularcore3}
 Description: development files for the Okular libraries
  This package contains development files for building Okular document format
  backends.
@@ -71,7 +80,7 @@ Description: development files for the Okular libraries
 
 Package: okular-extra-backends
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: okular
 Provides: djvu-viewer
 Description: additional document format support for Okular
@@ -87,7 +96,7 @@ Package: okular-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, okular (= ${binary:Version})
+Depends: okular (= ${binary:Version}), ${misc:Depends}
 Replaces: kdegraphics-dbg (<= 4.6.90)
 Breaks: kdegraphics-dbg (<= 4.6.90)
 Description: debugging symbols for okular
diff --git a/debian/copyright b/debian/copyright
index 756681a..5949e10 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -178,7 +178,7 @@ The file generators/chm/kio-msits/msits.cpp
 
     License:
     This files is under the LGPL v2 or later.
-    
+
 
 
 Files under generators/djvu/
@@ -240,7 +240,7 @@ The files:
 
 The file generators/dvi/bigEndianByteReader.h
     Upstream author:
-    
+
         Stefan Kebekus <kebekus at kde.org>
 
     License:
@@ -339,9 +339,9 @@ Files under generators/poppler/synctex/
         FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
         OTHER DEALINGS IN THE SOFTWARE
 
-        Except as contained in this notice, the name of the copyright holder  
-        shall not be used in advertising or otherwise to promote the sale,  
-        use or other dealings in this Software without prior written  
+        Except as contained in this notice, the name of the copyright holder
+        shall not be used in advertising or otherwise to promote the sale,
+        use or other dealings in this Software without prior written
         authorization from the copyright holder.
 
 Files under generators/spectre/
@@ -354,7 +354,7 @@ Files under generators/spectre/
 
 Files under generators/tiff/
     Upstream author:
-        
+
         Pino Toscano <toscano.pino at tiscali.it>
 
     License:
@@ -362,7 +362,7 @@ Files under generators/tiff/
 
 Files under generators/tiff/
     Upstream author:
-        
+
         Brad Hards <bradh at frogmouth.net>
 
     License:
diff --git a/debian/okular.install b/debian/okular.install
index 3790e1a..71a23ce 100644
--- a/debian/okular.install
+++ b/debian/okular.install
@@ -12,6 +12,7 @@ usr/lib/kde4/okularGenerator_poppler.so
 usr/lib/kde4/okularGenerator_txt.so
 usr/lib/kde4/okularGenerator_xps.so
 usr/lib/kde4/okularpart.so
+usr/share/applications/kde4/okular.desktop
 usr/share/applications/kde4/okularApplication_comicbook.desktop
 usr/share/applications/kde4/okularApplication_dvi.desktop
 usr/share/applications/kde4/okularApplication_fax.desktop
@@ -23,7 +24,6 @@ usr/share/applications/kde4/okularApplication_pdf.desktop
 usr/share/applications/kde4/okularApplication_plucker.desktop
 usr/share/applications/kde4/okularApplication_txt.desktop
 usr/share/applications/kde4/okularApplication_xps.desktop
-usr/share/applications/kde4/okular.desktop
 usr/share/doc/kde/HTML/*/okular
 usr/share/icons/hicolor/128x128/apps/okular.png
 usr/share/icons/hicolor/16x16/apps/okular.png
@@ -35,8 +35,8 @@ usr/share/icons/hicolor/scalable/apps/okular.svgz
 usr/share/kde4/apps/kconf_update/okular.upd
 usr/share/kde4/apps/okular/icons/hicolor/16x16/apps/okular-gv.png
 usr/share/kde4/apps/okular/icons/hicolor/32x32/apps/okular-gv.png
-usr/share/kde4/apps/okular/part.rc
 usr/share/kde4/apps/okular/part-viewermode.rc
+usr/share/kde4/apps/okular/part.rc
 usr/share/kde4/apps/okular/pics
 usr/share/kde4/apps/okular/shell.rc
 usr/share/kde4/apps/okular/tools.xml
@@ -62,9 +62,9 @@ usr/share/kde4/services/okularFb.desktop
 usr/share/kde4/services/okularGhostview.desktop
 usr/share/kde4/services/okularKimgio.desktop
 usr/share/kde4/services/okularOoo.desktop
-usr/share/kde4/services/okular_part.desktop
 usr/share/kde4/services/okularPlucker.desktop
 usr/share/kde4/services/okularPoppler.desktop
 usr/share/kde4/services/okularTxt.desktop
 usr/share/kde4/services/okularXps.desktop
+usr/share/kde4/services/okular_part.desktop
 usr/share/kde4/servicetypes/okularGenerator.desktop

-- 
okular packaging

More information about the pkg-kde-commits mailing list