r11079 - in /desktop/experimental/evince: ./ debian/ debian/patches/

he at users.alioth.debian.org he at users.alioth.debian.org
Sun May 20 12:46:16 UTC 2007 

Author: he
Date: Sun May 20 12:46:16 2007
New Revision: 11079

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11079
Log:
Branch off experimental evince 0.9, with a non-gnome evince-gtk package

Added:
    desktop/experimental/evince/
      - copied from r11057, desktop/unstable/evince/
    desktop/experimental/evince/debian/changelog
      - copied, changed from r11074, desktop/unstable/evince/debian/changelog
    desktop/experimental/evince/debian/control
      - copied, changed from r11073, desktop/unstable/evince/debian/control
    desktop/experimental/evince/debian/control.in
      - copied, changed from r11073, desktop/unstable/evince/debian/control.in
    desktop/experimental/evince/debian/copyright
      - copied unchanged from r11073, desktop/unstable/evince/debian/copyright
    desktop/experimental/evince/debian/evince-gtk.install.disabled
    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/10-comics_fix_INCLUDES.patch
    desktop/experimental/evince/debian/rules
      - copied, changed from r11073, desktop/unstable/evince/debian/rules
Modified:
    desktop/experimental/evince/debian/evince.install

Copied: desktop/experimental/evince/debian/changelog (from r11074, desktop/unstable/evince/debian/changelog)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/changelog?rev=11079&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog (original)
+++ desktop/experimental/evince/debian/changelog Sun May 20 12:46:16 2007
@@ -1,3 +1,23 @@
+evince (0.9.0-1) experimental; urgency=low
+
+  * New upstream release. New features include:
+    + Printing support in djvu documents
+    + Optional drop of libgnome dependency
+    + Print button for preview mode
+    + Remember print settings
+    + History button improvements
+   Some bugfixes: 
+    + Fixes for issues with fullscreen toolbar
+    + Fix for crash in comics backend when filename contains quote
+    + Fix unhelpful messages on invalid URLs. (Closes: #415692)
+
+  * Added needed magic to provide gtk-only packages (evince-gtk and
+    evince-gtk-dbg). (Closes: #399439)
+  * debian/patches/10-comics_fix_INCLUDES.patch: Added to work around
+     Gnome #439925)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org>  Sun, 20 May 2007 12:47:56 +0200
+
 evince (0.8.1-2) unstable; urgency=low
 
   * Upload to unstable; drop check-dist include.

Copied: desktop/experimental/evince/debian/control (from r11073, desktop/unstable/evince/debian/control)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/control?rev=11079&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control (original)
+++ desktop/experimental/evince/debian/control Sun May 20 12:46:16 2007
@@ -30,6 +30,8 @@
 Standards-Version: 3.7.2
 
 Package: evince
+Conflicts: evince-gtk
+Replaces: evince-gtk
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gs-esp | gs, gnome-icon-theme (>= 2.17.1)
 Provides: pdf-viewer, postscript-viewer
@@ -63,3 +65,44 @@
  Homepage: http://www.gnome.org/projects/evince/
  .
  This package contains the debugging symbols needed by gdb.
+
+Package: evince-gtk
+Conflicts: evince
+Replaces: evince
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gs-esp | gs, gnome-icon-theme (>= 2.17.1)
+Provides: pdf-viewer, postscript-viewer
+Suggests: unrar
+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.
+ .
+ The PDF renderer is based on poppler.  The PS renderer uses Ghostscript.
+ .
+ Homepage: http://www.gnome.org/projects/evince/
+
+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.
+ .
+ The PDF renderer is based on poppler.  The PS renderer uses Ghostscript.
+ .
+ Homepage: http://www.gnome.org/projects/evince/
+ .
+ This package contains the debugging symbols needed by gdb.

Copied: desktop/experimental/evince/debian/control.in (from r11073, desktop/unstable/evince/debian/control.in)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/control.in?rev=11079&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in (original)
+++ desktop/experimental/evince/debian/control.in Sun May 20 12:46:16 2007
@@ -30,6 +30,8 @@
 Standards-Version: 3.7.2
 
 Package: evince
+Conflicts: evince-gtk
+Replaces: evince-gtk
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, gs-esp | gs, gnome-icon-theme (>= 2.17.1)
 Provides: pdf-viewer, postscript-viewer
@@ -63,3 +65,44 @@
  Homepage: http://www.gnome.org/projects/evince/
  .
  This package contains the debugging symbols needed by gdb.
+
+Package: evince-gtk
+Conflicts: evince
+Replaces: evince
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gs-esp | gs, gnome-icon-theme (>= 2.17.1)
+Provides: pdf-viewer, postscript-viewer
+Suggests: unrar
+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.
+ .
+ The PDF renderer is based on poppler.  The PS renderer uses Ghostscript.
+ .
+ Homepage: http://www.gnome.org/projects/evince/
+
+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.
+ .
+ The PDF renderer is based on poppler.  The PS renderer uses Ghostscript.
+ .
+ Homepage: http://www.gnome.org/projects/evince/
+ .
+ This package contains the debugging symbols needed by gdb.

Added: desktop/experimental/evince/debian/evince-gtk.install.disabled
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-gtk.install.disabled?rev=11079&op=file
==============================================================================
--- desktop/experimental/evince/debian/evince-gtk.install.disabled (added)
+++ desktop/experimental/evince/debian/evince-gtk.install.disabled Sun May 20 12:46:16 2007
@@ -1,0 +1,14 @@
+/etc/gconf/schemas/ usr/share/gconf/
+/usr/share/applications/evince.desktop
+/usr/share/evince/
+/usr/share/icons/hicolor/
+/usr/share/gnome/help/evince/
+/usr/share/locale/
+/usr/share/omf/evince/
+/usr/share/man/man1/
+
+#Don't install gtk-doc for usual application package:
+#/usr/share/gtk-doc/
+
+/usr/bin/evince
+/usr/bin/evince-thumbnailer

Added: desktop/experimental/evince/debian/evince-gtk.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-gtk.manpages?rev=11079&op=file
==============================================================================
--- desktop/experimental/evince/debian/evince-gtk.manpages (added)
+++ desktop/experimental/evince/debian/evince-gtk.manpages Sun May 20 12:46:16 2007
@@ -1,0 +1,1 @@
+debian/evince-thumbnailer.1

Added: desktop/experimental/evince/debian/evince-gtk.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-gtk.menu?rev=11079&op=file
==============================================================================
--- desktop/experimental/evince/debian/evince-gtk.menu (added)
+++ desktop/experimental/evince/debian/evince-gtk.menu Sun May 20 12:46:16 2007
@@ -1,0 +1,3 @@
+?package(evince-gtk):needs="X11" section="Apps/Viewers"\
+ title="Evince" command="/usr/bin/evince"\
+ hints="Documents" icon="/usr/share/pixmaps/evince.xpm"

Added: desktop/experimental/evince/debian/evince-gtk.mime
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-gtk.mime?rev=11079&op=file
==============================================================================
--- desktop/experimental/evince/debian/evince-gtk.mime (added)
+++ desktop/experimental/evince/debian/evince-gtk.mime Sun May 20 12:46:16 2007
@@ -1,0 +1,4 @@
+application/pdf; evince %s; test=test -n "$DISPLAY" ; nametemplate=%s.pdf; priority=5
+application/postscript; evince %s; test=test -n "$DISPLAY" ; nametemplate=%s.ps; priority=5
+application/x-dvi; evince %s; test=test -n "$DISPLAY" ; nametemplate=%s.dvi; priority=5
+image/vnd.djvu; evince %s; test=test -n "$DISPLAY" ; nametemplate=%s.djvu; priority=5

Modified: desktop/experimental/evince/debian/evince.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince.install?rev=11079&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince.install (original)
+++ desktop/experimental/evince/debian/evince.install Sun May 20 12:46:16 2007
@@ -1,16 +1,15 @@
-debian/tmp/etc/gconf/schemas/ usr/share/gconf/
-debian/tmp/usr/share/applications/evince.desktop
-debian/tmp/usr/share/evince/
-debian/tmp/usr/share/icons/hicolor/
-debian/tmp/usr/share/gnome/help/evince/
-debian/tmp/usr/share/locale/
-debian/tmp/usr/share/omf/evince/
-debian/tmp/usr/share/man/man1/
+/etc/gconf/schemas/ usr/share/gconf/
+/usr/share/applications/evince.desktop
+/usr/share/evince/
+/usr/share/icons/hicolor/
+/usr/share/gnome/help/evince/
+/usr/share/locale/
+/usr/share/omf/evince/
+/usr/share/man/man1/
 
 #Don't install gtk-doc for usual application package:
-#debian/tmp/usr/share/gtk-doc/
+#/usr/share/gtk-doc/
 
-debian/evince.xpm usr/share/pixmaps/
-debian/tmp/usr/bin/evince
-debian/tmp/usr/bin/evince-thumbnailer
-debian/tmp/usr/lib/nautilus/extensions-1.0/libevince-properties-page.so
+/usr/bin/evince
+/usr/bin/evince-thumbnailer
+/usr/lib/nautilus/extensions-1.0/libevince-properties-page.so

Added: desktop/experimental/evince/debian/patches/10-comics_fix_INCLUDES.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/patches/10-comics_fix_INCLUDES.patch?rev=11079&op=file
==============================================================================
--- desktop/experimental/evince/debian/patches/10-comics_fix_INCLUDES.patch (added)
+++ desktop/experimental/evince/debian/patches/10-comics_fix_INCLUDES.patch Sun May 20 12:46:16 2007
@@ -1,0 +1,12 @@
+diff -Nwru evince-0.9.0/backend/comics/Makefile.in evince-0.9.0.patched/backend/comics/Makefile.in
+--- evince-0.9.0/backend/comics/Makefile.in	2007-05-14 20:13:26.000000000 +0000
++++ evince-0.9.0.patched/backend/comics/Makefile.in	2007-05-20 11:37:57.000000000 +0000
+@@ -305,7 +305,7 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)		\
+ 	-I$(top_srcdir)/libdocument \
+-	$(LIB_CFLAGS)
++	$(BACKEND_CFLAGS)
+ 
+ noinst_LTLIBRARIES = libcomicsdocument.la
+ libcomicsdocument_la_SOURCES = \

Copied: desktop/experimental/evince/debian/rules (from r11073, desktop/unstable/evince/debian/rules)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/rules?rev=11079&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules (original)
+++ desktop/experimental/evince/debian/rules Sun May 20 12:46:16 2007
@@ -1,10 +1,15 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
+
+DEB_BUILDDIR := $(CURDIR)/debian/build/evince
+DEB_DESTDIR := $(CURDIR)/debian/tmp/
+DEB_BUILDDIR_evince-gtk := $(CURDIR)/debian/build/evince-gtk
+DEB_DESTDIR_evince-gtk := $(CURDIR)/debian/tmp-gtk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper --enable-djvu \
@@ -13,9 +18,45 @@
 
 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)
+
 binary-install/evince::
+	cp debian/evince.install.disabled debian/evince.install
+	dh_install -pevince --sourcedir=$(DEB_DESTDIR)
 	dh_installmime -pevince
+	rm debian/evince.install
+	dh_install -pevince debian/evince.xpm /usr/share/pixmaps/
 
 binary-install/evince-dbg::
 	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::
+	cp debian/evince-gtk.install.disabled debian/evince-gtk.install
+	dh_install -pevince-gtk --sourcedir=$(DEB_DESTDIR_evince-gtk)
+	dh_installmime -pevince-gtk
+	rm debian/evince-gtk.install
+	dh_install -pevince-gtk debian/evince.xpm /usr/share/pixmaps/
+
+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
+

More information about the pkg-gnome-commits mailing list