r47882 - in /desktop/unstable/evince/debian: changelog control control.in evince-common.install evince-common.manpages evince.install evince.manpages

[bigon at users.alioth.debian.org]

Author: bigon
Date: Mon Apr 11 14:02:15 2016
New Revision: 47882

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47882
Log:
Move the manpages and the .desktop, icons, appdata, dconf, dbus/systemd
files from the -common package to the main one.

Added:
    desktop/unstable/evince/debian/evince.manpages
      - copied unchanged from r47881, desktop/unstable/evince/debian/evince-common.manpages
Removed:
    desktop/unstable/evince/debian/evince-common.manpages
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/control
    desktop/unstable/evince/debian/control.in
    desktop/unstable/evince/debian/evince-common.install
    desktop/unstable/evince/debian/evince.install

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=47882&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Mon Apr 11 14:02:15 2016
@@ -15,8 +15,10 @@
     Buchert (Closes: #762530)
   * debian/evince-gtk.lintian-overrides: Readd lintian override for
     versionless GPL for evince-gtk package until we drop it completely.
-
- -- Laurent Bigonville <bigon at debian.org>  Mon, 11 Apr 2016 13:54:38 +0200
+  * Move the manpages and the .desktop, icons, appdata, dconf, dbus/systemd
+    files from the -common package to the main one.
+
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 11 Apr 2016 15:47:01 +0200
 
 evince (3.20.0-1) unstable; urgency=medium
 

Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=47882&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control	[utf-8] (original)
+++ desktop/unstable/evince/debian/control	[utf-8] Mon Apr 11 14:02:15 2016
@@ -63,8 +63,8 @@
           unrar,
           poppler-data,
           nautilus
-Breaks: evince-gtk (<< 3.14.1-3~)
-Replaces: evince-gtk (<< 3.14.1-3~)
+Breaks: evince-gtk (<< 3.14.1-3~), evince-common (<< 3.20.0-2~)
+Replaces: evince-gtk (<< 3.14.1-3~), evince-common (<< 3.20.0-2~)
 Description: Document (PostScript, PDF) viewer
  Evince is a simple multi-page document viewer.  It can display and print
  PostScript (PS), Encapsulated PostScript (EPS), DjVu, DVI, Portable

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=47882&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in	[utf-8] (original)
+++ desktop/unstable/evince/debian/control.in	[utf-8] Mon Apr 11 14:02:15 2016
@@ -50,7 +50,8 @@
          evince-common (>= ${gnome:Version}),
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme-symbolic (>= 2.17.1),
-         shared-mime-info
+         shared-mime-info,
+         gsettings-desktop-schemas
 Recommends: dbus-x11
 Provides: pdf-viewer,
           postscript-viewer,
@@ -59,8 +60,8 @@
           unrar,
           poppler-data,
           nautilus
-Breaks: evince-gtk (<< 3.14.1-3~)
-Replaces: evince-gtk (<< 3.14.1-3~)
+Breaks: evince-gtk (<< 3.14.1-3~), evince-common (<< 3.20.0-2~)
+Replaces: evince-gtk (<< 3.14.1-3~), evince-common (<< 3.20.0-2~)
 Description: Document (PostScript, PDF) viewer
  Evince is a simple multi-page document viewer.  It can display and print
  PostScript (PS), Encapsulated PostScript (EPS), DjVu, DVI, Portable
@@ -80,8 +81,7 @@
 
 Package: evince-common
 Architecture: all
-Depends: ${misc:Depends},
-         gsettings-desktop-schemas
+Depends: ${misc:Depends}
 Description: Document (PostScript, PDF) viewer - common files
  Evince is a simple multi-page document viewer.  It can display and print
  PostScript (PS), Encapsulated PostScript (EPS), DjVu, DVI, Portable

Modified: desktop/unstable/evince/debian/evince-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince-common.install?rev=47882&op=diff
==============================================================================
--- desktop/unstable/evince/debian/evince-common.install	[utf-8] (original)
+++ desktop/unstable/evince/debian/evince-common.install	[utf-8] Mon Apr 11 14:02:15 2016
@@ -1,12 +1,3 @@
-usr/lib/systemd/user/evince.service
-usr/share/dbus-1
 usr/share/help
 usr/share/evince
-usr/share/icons
-usr/share/man
-usr/share/appdata
-usr/share/applications
 usr/share/locale
-usr/share/thumbnailers
-usr/share/glib-2.0/schemas
-usr/share/GConf/gsettings

Modified: desktop/unstable/evince/debian/evince.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince.install?rev=47882&op=diff
==============================================================================
--- desktop/unstable/evince/debian/evince.install	[utf-8] (original)
+++ desktop/unstable/evince/debian/evince.install	[utf-8] Mon Apr 11 14:02:15 2016
@@ -1,4 +1,12 @@
-# keep in sync with evince-gtk.install as needed
 usr/bin
+usr/lib/evince/evinced
 usr/lib/nautilus/*/*.so
-usr/lib/evince/evinced
+usr/lib/systemd/user/
+usr/share/appdata
+usr/share/applications
+usr/share/dbus-1
+usr/share/GConf/gsettings
+usr/share/glib-2.0/schemas
+usr/share/icons
+usr/share/man
+usr/share/thumbnailers