r17555 - in /desktop/experimental/evince/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri Nov 14 12:25:46 UTC 2008
Author: joss
Date: Fri Nov 14 12:25:46 2008
New Revision: 17555
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=17555
Log:
* New upstream release.
+ Control+N opens a new window. Closes: #479760.
+ Does not hang on corrupt djvu files. Closes: #477571.
+ Copies links to the primary selection. Closes: #469579.
+ More helpful error messages. Closes: #496487.
+ Control+Insert copies text. Closes: #463836.
* Update build-dependencies.
* Remove evince-gtk, the libgnome dependency has disappeared now.
* evince provides evince-gtk.
* Don’t generate dependencies for the nautilus extension.
* Suggest nautilus.
* 01_external_libgnome.patch: removed, gio is the default now.
* Recommend gvfs.
* 02_fix_saving_images.patch: dropped, merged upstream.
* Add application/x-cb7 to supported MIME types.
Removed:
desktop/experimental/evince/debian/evince-gtk.install
desktop/experimental/evince/debian/evince-gtk.lintian-override
desktop/experimental/evince/debian/evince-gtk.manpages
desktop/experimental/evince/debian/evince-gtk.menu
desktop/experimental/evince/debian/evince-gtk.mime
desktop/experimental/evince/debian/patches/01_external_libgnome.patch
desktop/experimental/evince/debian/patches/02_fix_saving_images.patch
Modified:
desktop/experimental/evince/debian/changelog
desktop/experimental/evince/debian/control
desktop/experimental/evince/debian/control.in
desktop/experimental/evince/debian/evince.mime
desktop/experimental/evince/debian/rules
Modified: desktop/experimental/evince/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/changelog?rev=17555&op=diff
==============================================================================
--- desktop/experimental/evince/debian/changelog (original)
+++ desktop/experimental/evince/debian/changelog Fri Nov 14 12:25:46 2008
@@ -1,3 +1,23 @@
+evince (2.24.1-1) experimental; urgency=low
+
+ * New upstream release.
+ + Control+N opens a new window. Closes: #479760.
+ + Does not hang on corrupt djvu files. Closes: #477571.
+ + Copies links to the primary selection. Closes: #469579.
+ + More helpful error messages. Closes: #496487.
+ + Control+Insert copies text. Closes: #463836.
+ * Update build-dependencies.
+ * Remove evince-gtk, the libgnome dependency has disappeared now.
+ * evince provides evince-gtk.
+ * Don’t generate dependencies for the nautilus extension.
+ * Suggest nautilus.
+ * 01_external_libgnome.patch: removed, gio is the default now.
+ * Recommend gvfs.
+ * 02_fix_saving_images.patch: dropped, merged upstream.
+ * Add application/x-cb7 to supported MIME types.
+
+ -- Josselin Mouette <joss at debian.org> Fri, 14 Nov 2008 12:37:55 +0100
+
evince (2.22.2-4) unstable; urgency=low
[ Loic Minier ]
Modified: desktop/experimental/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/control?rev=17555&op=diff
==============================================================================
--- desktop/experimental/evince/debian/control (original)
+++ desktop/experimental/evince/debian/control Fri Nov 14 12:25:46 2008
@@ -2,7 +2,7 @@
Section: gnome
Priority: optional
Maintainer: Marc 'HE' Brockschmidt <he at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
intltool (>= 0.35.0),
@@ -11,8 +11,6 @@
libglib2.0-dev (>= 2.15.6),
libgtk2.0-dev (>= 2.10.0),
libglade2-dev,
- libgnomeui-dev (>> 2.14.1-2),
- libgnome2-dev (>> 2.14),
libnautilus-extension-dev,
libgnome-keyring-dev (>= 0.4.0),
libdbus-glib-1-dev (>= 0.33),
@@ -42,7 +40,8 @@
Recommends: dbus-x11
Provides: pdf-viewer,
postscript-viewer,
- djvu-viewer
+ djvu-viewer,
+ evince-gtk
Suggests: unrar, poppler-data
Description: Document (postscript, pdf) viewer
Evince is a simple multi-page document viewer. It can display and print
@@ -65,42 +64,3 @@
table-of-contents bookmarks.
.
This package contains the debugging symbols needed by gdb.
-
-Package: evince-gtk
-Conflicts: evince
-Replaces: evince
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gnome-icon-theme (>= 2.17.1),
- shared-mime-info
-Recommends: dbus-x11
-Provides: pdf-viewer,
- postscript-viewer,
- djvu-viewer
-Suggests: unrar, poppler-data
-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 and Portable
- Document Format (PDF) 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 support.
-
-Package: evince-gtk-dbg
-Priority: extra
-Architecture: any
-Depends: evince-gtk (= ${binary:Version})
-Description: Document (postscript, pdf) viewer (gtk version) - debugging symbols
- Evince is a simple multi-page document viewer. It can display and print
- PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI and Portable
- Document Format (PDF) 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 support.
- .
- This package contains the debugging symbols needed by gdb.
Modified: desktop/experimental/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/control.in?rev=17555&op=diff
==============================================================================
--- desktop/experimental/evince/debian/control.in (original)
+++ desktop/experimental/evince/debian/control.in Fri Nov 14 12:25:46 2008
@@ -11,8 +11,6 @@
libglib2.0-dev (>= 2.15.6),
libgtk2.0-dev (>= 2.10.0),
libglade2-dev,
- libgnomeui-dev (>> 2.14.1-2),
- libgnome2-dev (>> 2.14),
libnautilus-extension-dev,
libgnome-keyring-dev (>= 0.4.0),
libdbus-glib-1-dev (>= 0.33),
@@ -39,11 +37,13 @@
${misc:Depends},
gnome-icon-theme (>= 2.17.1),
shared-mime-info
-Recommends: dbus-x11
+Recommends: dbus-x11,
+ gvfs
Provides: pdf-viewer,
postscript-viewer,
- djvu-viewer
-Suggests: unrar, poppler-data
+ djvu-viewer,
+ evince-gtk
+Suggests: unrar, poppler-data, nautilus
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 and Portable
@@ -65,42 +65,3 @@
table-of-contents bookmarks.
.
This package contains the debugging symbols needed by gdb.
-
-Package: evince-gtk
-Conflicts: evince
-Replaces: evince
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- gnome-icon-theme (>= 2.17.1),
- shared-mime-info
-Recommends: dbus-x11
-Provides: pdf-viewer,
- postscript-viewer,
- djvu-viewer
-Suggests: unrar, poppler-data
-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 and Portable
- Document Format (PDF) 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 support.
-
-Package: evince-gtk-dbg
-Priority: extra
-Architecture: any
-Depends: evince-gtk (= ${binary:Version})
-Description: Document (postscript, pdf) viewer (gtk version) - debugging symbols
- Evince is a simple multi-page document viewer. It can display and print
- PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI and Portable
- Document Format (PDF) 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 support.
- .
- This package contains the debugging symbols needed by gdb.
Modified: desktop/experimental/evince/debian/evince.mime
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince.mime?rev=17555&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince.mime (original)
+++ desktop/experimental/evince/debian/evince.mime Fri Nov 14 12:25:46 2008
@@ -15,6 +15,7 @@
image/tiff; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.tiff; priority=5
application/x-cbr; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.cbr; priority=5
application/x-cbz; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.cbz; priority=5
+application/x-cb7; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.cb7; priority=5
application/vnd.sun.xml.impress; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.sxd; priority=5
application/vnd.oasis.opendocument.presentation; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.odp; priority=5
Modified: desktop/experimental/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/rules?rev=17555&op=diff
==============================================================================
--- desktop/experimental/evince/debian/rules (original)
+++ desktop/experimental/evince/debian/rules Fri Nov 14 12:25:46 2008
@@ -6,10 +6,7 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_BUILDDIR := $(CURDIR)/debian/build/evince
DEB_DESTDIR := $(CURDIR)/debian/evince
-DEB_BUILDDIR_evince-gtk := $(CURDIR)/debian/build/evince-gtk
-DEB_DESTDIR_evince-gtk := $(CURDIR)/debian/evince-gtk
DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper \
--enable-djvu \
@@ -19,26 +16,7 @@
--enable-impress
DEB_DH_MAKESHLIBS_ARGS += --exclude=libevince-properties-page.so
-
-#cdbs should do this, but doesn't (see #424636)
-clean::
- rm -rf $(DEB_BUILDDIR) $(DEB_BUILDDIR_evince-gtk)
-
-configure/evince-gtk:: $(DEB_BUILDDIR_evince-gtk)/config.status
-$(DEB_BUILDDIR_evince-gtk)/config.status:
- cd $(DEB_BUILDDIR_evince-gtk) && \
- $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) \
- $(DEB_CONFIGURE_NORMAL_ARGS) \
- $(cdbs_configure_flags) \
- $(DEB_CONFIGURE_EXTRA_FLAGS) \
- --without-libgnome --disable-nautilus \
- $(DEB_CONFIGURE_USER_FLAGS)
-
-build/evince-gtk::
- make -C $(DEB_BUILDDIR_evince-gtk)
-
-install/evince-gtk::
- make -C $(DEB_BUILDDIR_evince-gtk) install DESTDIR=$(DEB_DESTDIR_evince-gtk)
+DEB_DH_SHLIBDEPS_ARGS_evince += --exclude=libevince-properties-page.so
binary-install/evince::
rm -rf debian/evince/usr/share/gtk-doc
@@ -49,16 +27,6 @@
rm -rf debian/evince-dbg/usr/share/doc/evince-dbg
dh_link -pevince-dbg usr/share/doc/evince usr/share/doc/evince-dbg
-binary-install/evince-gtk::
- rm -rf debian/evince-gtk/usr/share/gtk-doc
- #No development package:
- rm -rf debian/evince-gtk/usr/lib/nautilus/*/*a debian/evince-gtk/usr/lib/*a debian/evince-gtk/usr/lib/evince/*/*a debian/evince-gtk/usr/include/ debian/evince-gtk/usr/lib/libevbackend.so
- rm -rf debian/evince-gtk/usr/lib/nautilus
-
-binary-install/evince-gtk-dbg::
- rm -rf debian/evince-gtk-dbg/usr/share/doc/evince-gtk-dbg
- dh_link -pevince-gtk-dbg usr/share/doc/evince-gtk usr/share/doc/evince-gtk-dbg
-
binary-post-install/evince::
# check for missing MIME types
desktop-check-mime-types
More information about the pkg-gnome-commits
mailing list