r21944 - in /desktop/unstable/evince/debian: changelog control control.in patches/01_fix_last_page_in_presentations.patch patches/60_gzdvi-support.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Oct 17 09:28:23 2009
New Revision: 21944

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21944
Log:
Merge experimental evince branch into unstable.

Removed:
    desktop/unstable/evince/debian/patches/01_fix_last_page_in_presentations.patch
    desktop/unstable/evince/debian/patches/60_gzdvi-support.patch
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=21944&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog [utf-8] (original)
+++ desktop/unstable/evince/debian/changelog [utf-8] Sat Oct 17 09:28:23 2009
@@ -1,3 +1,22 @@
+evince (2.28.0-2) UNRELEASED; urgency=low
+
+  * Remove the libgs-dev dependency now that libspectre has been fixed.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 05 Oct 2009 08:15:22 +0200
+
+evince (2.28.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Disable D-Bus in the GTK+ build.
+  * Add missing -dev dependencies.
+  * Bump shlibs for libevince1.
+  * 01_fix_last_page_in_presentations.patch, 60_gzdvi-support.patch: 
+    dropped, merged upstream.
+  * Add build-dependency on libgs-dev because of the broken 
+    libspectre.la.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 25 Sep 2009 19:06:36 +0200
+
 evince (2.26.2-2) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=21944&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control [utf-8] (original)
+++ desktop/unstable/evince/debian/control [utf-8] Sat Oct 17 09:28:23 2009
@@ -10,7 +10,7 @@
                gnome-doc-utils (>= 0.3.2),
                gtk-doc-tools (>= 1.0),
                libdbus-glib-1-dev (>= 0.70),
-               libgtk2.0-dev (>= 2.12.0),
+               libgtk2.0-dev (>= 2.14.0),
                libglib2.0-dev (>= 2.18.0),
                libgnome-keyring-dev (>= 2.22.0),
                gnome-icon-theme (>= 2.17.1),
@@ -19,7 +19,7 @@
                libgconf2-dev,
                zlib1g-dev,
                libnautilus-extension-dev,
-               libpoppler-glib-dev (>= 0.8.0),
+               libpoppler-glib-dev (>= 0.11.0),
                libspectre-dev (>= 0.2.0),
                libtiff4-dev,
                libdjvulibre-dev (>= 3.5.17),
@@ -131,7 +131,9 @@
 Architecture: any
 Section: libdevel
 Depends: libevince1 (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         libgtk2.0-dev (>= 2.14.0),
+         libglib2.0-dev (>= 2.18.0)
 Replaces: evince (<< 2.26.2), evince-gtk (<< 2.26.2)
 Description: Document (postscript, pdf) rendering library - development files
  This package contains evince-related libraries for rendering and displaying

Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=21944&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in [utf-8] (original)
+++ desktop/unstable/evince/debian/control.in [utf-8] Sat Oct 17 09:28:23 2009
@@ -10,7 +10,7 @@
                gnome-doc-utils (>= 0.3.2),
                gtk-doc-tools (>= 1.0),
                libdbus-glib-1-dev (>= 0.70),
-               libgtk2.0-dev (>= 2.12.0),
+               libgtk2.0-dev (>= 2.14.0),
                libglib2.0-dev (>= 2.18.0),
                libgnome-keyring-dev (>= 2.22.0),
                gnome-icon-theme (>= 2.17.1),
@@ -19,7 +19,7 @@
                libgconf2-dev,
                zlib1g-dev,
                libnautilus-extension-dev,
-               libpoppler-glib-dev (>= 0.8.0),
+               libpoppler-glib-dev (>= 0.11.0),
                libspectre-dev (>= 0.2.0),
                libtiff4-dev,
                libdjvulibre-dev (>= 3.5.17),
@@ -131,7 +131,9 @@
 Architecture: any
 Section: libdevel
 Depends: libevince1 (= ${binary:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         libgtk2.0-dev (>= 2.14.0),
+         libglib2.0-dev (>= 2.18.0)
 Replaces: evince (<< 2.26.2), evince-gtk (<< 2.26.2)
 Description: Document (postscript, pdf) rendering library - development files
  This package contains evince-related libraries for rendering and displaying

Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=21944&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules [utf-8] (original)
+++ desktop/unstable/evince/debian/rules [utf-8] Sat Oct 17 09:28:23 2009
@@ -20,7 +20,8 @@
 			--enable-comics \
 			--enable-impress
 
-DEB_DH_MAKESHLIBS_ARGS += --exclude=libevince-properties-page.so
+DEB_DH_MAKESHLIBS_ARGS += --exclude=libevince-properties-page.so \
+	-V'libevince1 (>= 2.28)'
 
 #cdbs should do this, but doesn't (see #424636)
 clean::
@@ -33,7 +34,10 @@
 			$(DEB_CONFIGURE_NORMAL_ARGS) \
 			$(cdbs_configure_flags) \
 			$(DEB_CONFIGURE_EXTRA_FLAGS) \
-			--without-keyring --without-gconf --disable-nautilus \
+			--without-keyring \
+			--without-gconf \
+			--disable-nautilus \
+			--disable-dbus \
 			$(DEB_CONFIGURE_USER_FLAGS)
 
 build/evince-gtk::