r44456 - in /desktop/unstable/evince/debian: changelog control control.in evince-gtk.install evince-gtk.lintian-overrides evince-gtk.menu rules

fabian at users.alioth.debian.org fabian at users.alioth.debian.org
Tue May 19 16:07:16 UTC 2015 

Author: fabian
Date: Tue May 19 16:07:16 2015
New Revision: 44456

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44456
Log:
* Team upload.
* Build only the full-flavored variant of Evince (Closes: #755071).
  + Disable building of the evince-gtk flavor.
  + Turn evince-gtk into a transitional package that depends on evince.
  + Add Breaks and Replaces to the evince package accordingly.
  + Move gvfs from Recommends to Suggests.
  + Exclude the "/usr/lib/nautilus/" path from dh_shlibdeps to avoid
    the infamous dependency on libnautilus*.
* Append "-Wl,--as-needed -Wl,-z,defs" to LDFLAGS to avoid more
  unnecessary dependencies.

Removed:
    desktop/unstable/evince/debian/evince-gtk.install
    desktop/unstable/evince/debian/evince-gtk.lintian-overrides
    desktop/unstable/evince/debian/evince-gtk.menu
Modified:
    desktop/unstable/evince/debian/changelog
    desktop/unstable/evince/debian/control
    desktop/unstable/evince/debian/control.in
    desktop/unstable/evince/debian/rules

Modified: desktop/unstable/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/changelog?rev=44456&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Tue May 19 16:07:16 2015
@@ -1,3 +1,18 @@
+evince (3.14.1-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Build only the full-flavored variant of Evince (Closes: #755071).
+    + Disable building of the evince-gtk flavor.
+    + Turn evince-gtk into a transitional package that depends on evince.
+    + Add Breaks and Replaces to the evince package accordingly.
+    + Move gvfs from Recommends to Suggests.
+    + Exclude the "/usr/lib/nautilus/" path from dh_shlibdeps to avoid
+      the infamous dependency on libnautilus*.
+  * Append "-Wl,--as-needed -Wl,-z,defs" to LDFLAGS to avoid more
+    unnecessary dependencies.
+
+ -- Fabian Greffrath <fabian at debian.org>  Tue, 19 May 2015 17:19:59 +0200
+
 evince (3.14.1-2) unstable; urgency=medium
 
   * Team upload.

Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=44456&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control	[utf-8] (original)
+++ desktop/unstable/evince/debian/control	[utf-8] Tue May 19 16:07:16 2015
@@ -44,7 +44,6 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/evince
 
 Package: evince
-Conflicts: evince-gtk
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -54,14 +53,16 @@
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme-symbolic (>= 2.17.1),
          shared-mime-info
-Recommends: dbus-x11,
-            gvfs
+Recommends: dbus-x11
 Provides: pdf-viewer,
           postscript-viewer,
           djvu-viewer
-Suggests: unrar,
+Suggests: gvfs,
+          unrar,
           poppler-data,
           nautilus
+Breaks: evince-gtk (<< 3.14.1-3~)
+Replaces: evince-gtk (<< 3.14.1-3~)
 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
@@ -89,34 +90,13 @@
  This package contains the debugging symbols needed by gdb.
 
 Package: evince-gtk
-Section: x11
-Conflicts: evince
+Section: oldlibs
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: evince (= ${binary:Version}),
          ${misc:Depends},
-         libevdocument3-4 (= ${binary:Version}),
-         libevview3-3 (= ${binary:Version}),
-         evince-common (>= ${gnome:Version}),
-         evince-common (<< ${gnome:NextVersion}),
-         gnome-icon-theme-symbolic (>= 2.17.1),
-         shared-mime-info
-Recommends: dbus-x11
-Provides: pdf-viewer,
-          postscript-viewer,
-          djvu-viewer
-Suggests: gvfs,
-          unrar,
-          poppler-data,
-          nautilus
-Description: Document (PostScript, PDF) viewer (GTK+ version)
- Evince is a simple multi-page document viewer.  It can display and print
- PostScript (PS), Encapsulated PostScript (EPS), DjVu, DVI, Portable
- Document Format (PDF) and XML Paper Specification (XPS) files.
- When supported by the document, it also allows searching for text,
- copying text to the clipboard, hypertext navigation, and
- table-of-contents bookmarks.
- .
- This version of evince is built without GNOME keyring support.
+Description: dummy package for the transition from evince-gtk to evince
+ This package is a transitional dummy package. It can be safely removed.
 
 Package: evince-common
 Architecture: all
@@ -130,7 +110,7 @@
  copying text to the clipboard, hypertext navigation, and
  table-of-contents bookmarks.
  .
- This package contains shared files for evince and evince-gtk packages.
+ This package contains architecture-independent files for evince.
 
 Package: libevdocument3-4
 Architecture: any

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=44456&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in	[utf-8] (original)
+++ desktop/unstable/evince/debian/control.in	[utf-8] Tue May 19 16:07:16 2015
@@ -40,7 +40,6 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/evince
 
 Package: evince
-Conflicts: evince-gtk
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -50,14 +49,16 @@
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme-symbolic (>= 2.17.1),
          shared-mime-info
-Recommends: dbus-x11,
-            gvfs
+Recommends: dbus-x11
 Provides: pdf-viewer,
           postscript-viewer,
           djvu-viewer
-Suggests: unrar,
+Suggests: gvfs,
+          unrar,
           poppler-data,
           nautilus
+Breaks: evince-gtk (<< 3.14.1-3~)
+Replaces: evince-gtk (<< 3.14.1-3~)
 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
@@ -85,34 +86,13 @@
  This package contains the debugging symbols needed by gdb.
 
 Package: evince-gtk
-Section: x11
-Conflicts: evince
+Section: oldlibs
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: evince (= ${binary:Version}),
          ${misc:Depends},
-         libevdocument3-4 (= ${binary:Version}),
-         libevview3-3 (= ${binary:Version}),
-         evince-common (>= ${gnome:Version}),
-         evince-common (<< ${gnome:NextVersion}),
-         gnome-icon-theme-symbolic (>= 2.17.1),
-         shared-mime-info
-Recommends: dbus-x11
-Provides: pdf-viewer,
-          postscript-viewer,
-          djvu-viewer
-Suggests: gvfs,
-          unrar,
-          poppler-data,
-          nautilus
-Description: Document (PostScript, PDF) viewer (GTK+ version)
- Evince is a simple multi-page document viewer.  It can display and print
- PostScript (PS), Encapsulated PostScript (EPS), DjVu, DVI, Portable
- Document Format (PDF) and XML Paper Specification (XPS) files.
- When supported by the document, it also allows searching for text,
- copying text to the clipboard, hypertext navigation, and
- table-of-contents bookmarks.
- .
- This version of evince is built without GNOME keyring support.
+Description: dummy package for the transition from evince-gtk to evince
+ This package is a transitional dummy package. It can be safely removed.
 
 Package: evince-common
 Architecture: all
@@ -126,7 +106,7 @@
  copying text to the clipboard, hypertext navigation, and
  table-of-contents bookmarks.
  .
- This package contains shared files for evince and evince-gtk packages.
+ This package contains architecture-independent files for evince.
 
 Package: libevdocument3-4
 Architecture: any

Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=44456&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules	[utf-8] (original)
+++ desktop/unstable/evince/debian/rules	[utf-8] Tue May 19 16:07:16 2015
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,defs
 
 DEB_BUILDDIR = debian/build
 DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/install/@FLAVOR@
-DEB_MAKE_FLAVORS = evince evince-gtk
+DEB_MAKE_FLAVORS = evince # evince-gtk
 
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -26,6 +27,8 @@
 DEB_DH_MAKESHLIBS_ARGS += -X /usr/lib/nautilus/ -X /usr/lib/evince/ \
 	-V -- -c4
 
+DEB_DH_SHLIBDEPS_ARGS += -X /usr/lib/nautilus/
+
 DEB_DH_STRIP_ARGS_evince-gtk =
 
 DEB_CONFIGURE_FLAGS_evince = \

More information about the pkg-gnome-commits mailing list