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

ah at users.alioth.debian.org ah at users.alioth.debian.org
Wed Jun 17 14:27:04 UTC 2015 

Author: ah
Date: Wed Jun 17 14:27:04 2015
New Revision: 45304

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45304
Log:
Temporarily revert to latest uploaded state


Added:
    desktop/unstable/evince/debian/evince-gtk.install
      - copied unchanged from r44148, desktop/unstable/evince/debian/evince-gtk.install
    desktop/unstable/evince/debian/evince-gtk.lintian-overrides
      - copied unchanged from r44148, desktop/unstable/evince/debian/evince-gtk.lintian-overrides
    desktop/unstable/evince/debian/evince-gtk.menu
      - copied unchanged from r44148, 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=45304&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog	[utf-8] (original)
+++ desktop/unstable/evince/debian/changelog	[utf-8] Wed Jun 17 14:27:04 2015
@@ -1,18 +1,3 @@
-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=45304&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control	[utf-8] (original)
+++ desktop/unstable/evince/debian/control	[utf-8] Wed Jun 17 14:27:04 2015
@@ -44,6 +44,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/evince
 
 Package: evince
+Conflicts: evince-gtk
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -53,16 +54,14 @@
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme-symbolic (>= 2.17.1),
          shared-mime-info
-Recommends: dbus-x11
+Recommends: dbus-x11,
+            gvfs
 Provides: pdf-viewer,
           postscript-viewer,
           djvu-viewer
-Suggests: gvfs,
-          unrar,
+Suggests: 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
@@ -90,13 +89,34 @@
  This package contains the debugging symbols needed by gdb.
 
 Package: evince-gtk
-Section: oldlibs
-Priority: extra
+Section: x11
+Conflicts: evince
 Architecture: any
-Depends: evince (= ${binary:Version}),
+Depends: ${shlibs:Depends},
          ${misc:Depends},
-Description: dummy package for the transition from evince-gtk to evince
- This package is a transitional dummy package. It can be safely removed.
+         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.
 
 Package: evince-common
 Architecture: all
@@ -110,7 +130,7 @@
  copying text to the clipboard, hypertext navigation, and
  table-of-contents bookmarks.
  .
- This package contains architecture-independent files for evince.
+ This package contains shared files for evince and evince-gtk packages.
 
 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=45304&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in	[utf-8] (original)
+++ desktop/unstable/evince/debian/control.in	[utf-8] Wed Jun 17 14:27:04 2015
@@ -40,6 +40,7 @@
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/evince
 
 Package: evince
+Conflicts: evince-gtk
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -49,16 +50,14 @@
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme-symbolic (>= 2.17.1),
          shared-mime-info
-Recommends: dbus-x11
+Recommends: dbus-x11,
+            gvfs
 Provides: pdf-viewer,
           postscript-viewer,
           djvu-viewer
-Suggests: gvfs,
-          unrar,
+Suggests: 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
@@ -86,13 +85,34 @@
  This package contains the debugging symbols needed by gdb.
 
 Package: evince-gtk
-Section: oldlibs
-Priority: extra
+Section: x11
+Conflicts: evince
 Architecture: any
-Depends: evince (= ${binary:Version}),
+Depends: ${shlibs:Depends},
          ${misc:Depends},
-Description: dummy package for the transition from evince-gtk to evince
- This package is a transitional dummy package. It can be safely removed.
+         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.
 
 Package: evince-common
 Architecture: all
@@ -106,7 +126,7 @@
  copying text to the clipboard, hypertext navigation, and
  table-of-contents bookmarks.
  .
- This package contains architecture-independent files for evince.
+ This package contains shared files for evince and evince-gtk packages.
 
 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=45304&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules	[utf-8] (original)
+++ desktop/unstable/evince/debian/rules	[utf-8] Wed Jun 17 14:27:04 2015
@@ -4,7 +4,7 @@
 
 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
@@ -13,9 +13,6 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-include /usr/share/dpkg/buildflags.mk
 
 DEB_DH_INSTALL_ARGS += --sourcedir=debian/install/evince
 DEB_DH_INSTALL_ARGS_evince-gtk += --sourcedir=debian/install/evince-gtk
@@ -28,8 +25,6 @@
 
 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 =

More information about the pkg-gnome-commits mailing list