r27562 - in /desktop/experimental/evince/debian: ./ lintian/ patches/

fpeters at users.alioth.debian.org fpeters at users.alioth.debian.org
Thu Apr 14 14:19:49 UTC 2011


Author: fpeters
Date: Thu Apr 14 14:19:44 2011
New Revision: 27562

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27562
Log:
  * debian/control.in:
    + Update list of build dependencies for new release.
    + Make the -dev package depend on the gir package.
    + Add build-dependency on dh-autoreconf.
    + Update libevince3-3 description to note the removal of the pixbuf and
      impress backends.
    + Update evince-gtk description as evince doesn't depend on GConf.
  * debian/rules:
    + include dh-autoreconf
    + update configure flags (pixbuf and impress backends have been removed).
  * debian/patches/01_dvi_security.patch: removed, upstream.
  * debian/patches/00_gir-libdocument-library-path.patch: fix call to
    g-ir-scanner to make it find libdocument3.
  * debian/evince-common.install: install GSettings schemas.


Added:
    desktop/experimental/evince/debian/evince-dbg.install
    desktop/experimental/evince/debian/gir1.2-evince-3.0.install
      - copied, changed from r27445, desktop/experimental/evince/debian/gir1.0-evince-2.30.install
    desktop/experimental/evince/debian/libevince3-3.install
      - copied, changed from r27445, desktop/experimental/evince/debian/libevince2.install
    desktop/experimental/evince/debian/lintian/evince-dbg
    desktop/experimental/evince/debian/lintian/gir1.2-evince-3.0
    desktop/experimental/evince/debian/lintian/libevince3-3
      - copied, changed from r27445, desktop/experimental/evince/debian/lintian/libevince2
    desktop/experimental/evince/debian/patches/00_gir-libdocument-library-path.patch
Removed:
    desktop/experimental/evince/debian/gir1.0-evince-2.30.install
    desktop/experimental/evince/debian/libevince2.install
    desktop/experimental/evince/debian/lintian/libevince2
    desktop/experimental/evince/debian/patches/01_dvi_security.patch
Modified:
    desktop/experimental/evince/debian/changelog
    desktop/experimental/evince/debian/control
    desktop/experimental/evince/debian/control.in
    desktop/experimental/evince/debian/evince-common.install
    desktop/experimental/evince/debian/evince-gtk.mime
    desktop/experimental/evince/debian/evince.install
    desktop/experimental/evince/debian/evince.mime
    desktop/experimental/evince/debian/patches/series
    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=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/changelog [utf-8] (original)
+++ desktop/experimental/evince/debian/changelog [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,4 +1,6 @@
-evince (2.30.3-3) UNRELEASED; urgency=low
+evince (3.0.0-1) experimental; urgency=low
+
+  * New upstream release.
 
   [ Josselin Mouette ]
   * Fix indentation in package description. Closes: #609770.
@@ -8,7 +10,23 @@
     - Don't put evince-gtk's debugging symbols in evince-dbg, as they
       clash with those from evince itself. Closes: #610856.
 
- -- Josselin Mouette <joss at debian.org>  Wed, 12 Jan 2011 14:56:06 +0100
+  [ Frederic Peters ]
+  * debian/control.in:
+    + Update list of build dependencies for new release.
+    + Make the -dev package depend on the gir package.
+    + Add build-dependency on dh-autoreconf.
+    + Update libevince3-3 description to note the removal of the pixbuf and
+      impress backends.
+    + Update evince-gtk description as evince doesn't depend on GConf.
+  * debian/rules:
+    + include dh-autoreconf
+    + update configure flags (pixbuf and impress backends have been removed).
+  * debian/patches/01_dvi_security.patch: removed, upstream.
+  * debian/patches/00_gir-libdocument-library-path.patch: fix call to
+    g-ir-scanner to make it find libdocument3.
+  * debian/evince-common.install: install GSettings schemas.
+
+ -- Frederic Peters <fpeters at debian.org>  Thu, 14 Apr 2011 15:28:56 +0200
 
 evince (2.30.3-2) unstable; urgency=medium
 

Modified: desktop/experimental/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/control?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/control [utf-8] (original)
+++ desktop/experimental/evince/debian/control [utf-8] Thu Apr 14 14:19:44 2011
@@ -7,36 +7,37 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
+               dh-autoreconf,
                intltool (>= 0.35.0),
                gnome-pkg-tools (>= 0.10),
                gnome-doc-utils (>= 0.3.2),
                gtk-doc-tools (>= 1.0),
-               libdbus-glib-1-dev (>= 0.70),
                libx11-dev,
-               libgtk2.0-dev (>= 2.14.0),
-               libglib2.0-dev (>= 2.18.0),
+               libcairo2-dev (>= 1.10.0),
+               libgtk-3-dev (>= 3.0.2),
+               libgail-3-dev (>= 3.0.2),
+               libglib2.0-dev (>= 2.25.1),
                libgnome-keyring-dev (>= 2.22.0),
                gnome-icon-theme (>= 2.17.1),
                libxml2-dev (>= 2.5.0),
                libsm-dev (>= 2:1.0.0),
-               libgconf2-dev,
                zlib1g-dev,
-               libnautilus-extension-dev,
-               libpoppler-glib-dev (>= 0.12.0),
+               libnautilus-extension-dev (>= 2.91.4),
+               libpoppler-glib-dev (>= 0.16.0),
                libspectre-dev (>= 0.2.0),
                libtiff4-dev,
                libdjvulibre-dev (>= 3.5.17),
                libkpathsea-dev,
                libt1-dev,
                autotools-dev,
-               libgirepository1.0-dev (>= 0.6.7),
-               gobject-introspection (>= 0.6.7),
+               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev (>= 0.9.12),
                gir-repository-dev,
-               gir1.0-glib-2.0,
-               gir1.0-gtk-2.0
+               gir1.2-glib-2.0,
+               gir1.2-gtk-3.0
 Standards-Version: 3.8.4
 Homepage: http://www.gnome.org/projects/evince/
 
@@ -45,7 +46,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libevince2 (= ${binary:Version}),
+         libevince3-3 (= ${binary:Version}),
          evince-common (>= ${gnome:Version}),
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme (>= 2.17.1),
@@ -70,7 +71,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          evince (= ${binary:Version}),
-         libevince2 (= ${binary:Version})
+         libevince3-3 (= ${binary:Version})
 Description: Document (PostScript, PDF) viewer - debugging symbols
  Evince is a simple multi-page document viewer.  It can display and print
  PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI and Portable
@@ -87,7 +88,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libevince2 (= ${binary:Version}),
+         libevince3-3 (= ${binary:Version}),
          evince-common (>= ${gnome:Version}),
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme (>= 2.17.1),
@@ -105,8 +106,7 @@
  copying text to the clipboard, hypertext navigation, and
  table-of-contents bookmarks.
  .
- This version of evince is built without GConf and GNOME keyring 
- support.
+ This version of evince is built without GNOME keyring support.
 
 Package: evince-common
 Architecture: all
@@ -122,7 +122,7 @@
  .
  This package contains shared files for evince and evince-gtk packages.
 
-Package: libevince2
+Package: libevince3-3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -135,16 +135,16 @@
   * libevdocument, which performs the rendering of the documents
   * libevview, which provides GTK+ widgets for displaying documents
  .
- It is shipped with the ps, pdf, dvi, impress, tiff, djvu, comics and
- pixbuf backends.
+ It is shipped with the ps, pdf, dvi, tiff, djvu, comics pixbuf backends.
 
 Package: libevince-dev
 Architecture: any
 Section: libdevel
-Depends: libevince2 (= ${binary:Version}),
+Depends: libevince3-3 (= ${binary:Version}),
          ${misc:Depends},
-         libgtk2.0-dev (>= 2.14.0),
-         libglib2.0-dev (>= 2.18.0)
+         libgtk-3-dev (>= 3.0.2),
+         libglib2.0-dev (>= 2.25.1),
+         gir1.2-evince-3.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
@@ -156,14 +156,14 @@
  This package provides the development headers, static libraries and 
  documentation.
 
-Package: gir1.0-evince-2.30
+Package: gir1.2-evince-3.0
 Section: libs
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Provides: gir1.0-evince-document-2.30,
-          gir1.0-evince-view-2.30
+Provides: gir1.2-evince-document-3.0,
+          gir1.2-evince-view-3.0
 Description: GObject introspection data for the libevince library
  This package contains introspection data for the libevince library.
  .

Modified: desktop/experimental/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/control.in?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/control.in [utf-8] (original)
+++ desktop/experimental/evince/debian/control.in [utf-8] Thu Apr 14 14:19:44 2011
@@ -5,33 +5,34 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 5),
+               dh-autoreconf,
                intltool (>= 0.35.0),
                gnome-pkg-tools (>= 0.10),
                gnome-doc-utils (>= 0.3.2),
                gtk-doc-tools (>= 1.0),
-               libdbus-glib-1-dev (>= 0.70),
                libx11-dev,
-               libgtk2.0-dev (>= 2.14.0),
-               libglib2.0-dev (>= 2.18.0),
+               libcairo2-dev (>= 1.10.0),
+               libgtk-3-dev (>= 3.0.2),
+               libgail-3-dev (>= 3.0.2),
+               libglib2.0-dev (>= 2.25.1),
                libgnome-keyring-dev (>= 2.22.0),
                gnome-icon-theme (>= 2.17.1),
                libxml2-dev (>= 2.5.0),
                libsm-dev (>= 2:1.0.0),
-               libgconf2-dev,
                zlib1g-dev,
-               libnautilus-extension-dev,
-               libpoppler-glib-dev (>= 0.12.0),
+               libnautilus-extension-dev (>= 2.91.4),
+               libpoppler-glib-dev (>= 0.16.0),
                libspectre-dev (>= 0.2.0),
                libtiff4-dev,
                libdjvulibre-dev (>= 3.5.17),
                libkpathsea-dev,
                libt1-dev,
                autotools-dev,
-               libgirepository1.0-dev (>= 0.6.7),
-               gobject-introspection (>= 0.6.7),
+               gobject-introspection (>= 0.9.12-4~),
+               libgirepository1.0-dev (>= 0.9.12),
                gir-repository-dev,
-               gir1.0-glib-2.0,
-               gir1.0-gtk-2.0
+               gir1.2-glib-2.0,
+               gir1.2-gtk-3.0
 Standards-Version: 3.8.4
 Homepage: http://www.gnome.org/projects/evince/
 
@@ -40,7 +41,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libevince2 (= ${binary:Version}),
+         libevince3-3 (= ${binary:Version}),
          evince-common (>= ${gnome:Version}),
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme (>= 2.17.1),
@@ -65,7 +66,7 @@
 Architecture: any
 Depends: ${misc:Depends},
          evince (= ${binary:Version}),
-         libevince2 (= ${binary:Version})
+         libevince3-3 (= ${binary:Version})
 Description: Document (PostScript, PDF) viewer - debugging symbols
  Evince is a simple multi-page document viewer.  It can display and print
  PostScript (PS), Encapsulated PostScript (EPS), DJVU, DVI and Portable
@@ -82,7 +83,7 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libevince2 (= ${binary:Version}),
+         libevince3-3 (= ${binary:Version}),
          evince-common (>= ${gnome:Version}),
          evince-common (<< ${gnome:NextVersion}),
          gnome-icon-theme (>= 2.17.1),
@@ -100,8 +101,7 @@
  copying text to the clipboard, hypertext navigation, and
  table-of-contents bookmarks.
  .
- This version of evince is built without GConf and GNOME keyring 
- support.
+ This version of evince is built without GNOME keyring support.
 
 Package: evince-common
 Architecture: all
@@ -117,7 +117,7 @@
  .
  This package contains shared files for evince and evince-gtk packages.
 
-Package: libevince2
+Package: libevince3-3
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -130,16 +130,16 @@
   * libevdocument, which performs the rendering of the documents
   * libevview, which provides GTK+ widgets for displaying documents
  .
- It is shipped with the ps, pdf, dvi, impress, tiff, djvu, comics and
- pixbuf backends.
+ It is shipped with the ps, pdf, dvi, tiff, djvu, comics pixbuf backends.
 
 Package: libevince-dev
 Architecture: any
 Section: libdevel
-Depends: libevince2 (= ${binary:Version}),
+Depends: libevince3-3 (= ${binary:Version}),
          ${misc:Depends},
-         libgtk2.0-dev (>= 2.14.0),
-         libglib2.0-dev (>= 2.18.0)
+         libgtk-3-dev (>= 3.0.2),
+         libglib2.0-dev (>= 2.25.1),
+         gir1.2-evince-3.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
@@ -151,14 +151,14 @@
  This package provides the development headers, static libraries and 
  documentation.
 
-Package: gir1.0-evince-2.30
+Package: gir1.2-evince-3.0
 Section: libs
 Architecture: any
 Depends: ${gir:Depends},
          ${shlibs:Depends},
          ${misc:Depends}
-Provides: gir1.0-evince-document-2.30,
-          gir1.0-evince-view-2.30
+Provides: gir1.2-evince-document-3.0,
+          gir1.2-evince-view-3.0
 Description: GObject introspection data for the libevince library
  This package contains introspection data for the libevince library.
  .

Modified: desktop/experimental/evince/debian/evince-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-common.install?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince-common.install [utf-8] (original)
+++ desktop/experimental/evince/debian/evince-common.install [utf-8] Thu Apr 14 14:19:44 2011
@@ -3,8 +3,9 @@
 debian/tmp/usr/share/dbus-1
 debian/tmp/usr/share/gnome
 debian/tmp/usr/share/evince
-debian/tmp/usr/share/omf
 debian/tmp/usr/share/icons
 debian/tmp/usr/share/man
 debian/tmp/usr/share/applications
 debian/tmp/usr/share/locale
+debian/tmp/usr/share/glib-2.0/schemas
+debian/tmp/usr/share/GConf/gsettings

Added: desktop/experimental/evince/debian/evince-dbg.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-dbg.install?rev=27562&op=file
==============================================================================
--- desktop/experimental/evince/debian/evince-dbg.install (added)
+++ desktop/experimental/evince/debian/evince-dbg.install [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,0 +1,1 @@
+debian/lintian/evince-dbg /usr/share/lintian/overrides/

Modified: desktop/experimental/evince/debian/evince-gtk.mime
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince-gtk.mime?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince-gtk.mime [utf-8] (original)
+++ desktop/experimental/evince/debian/evince-gtk.mime [utf-8] Thu Apr 14 14:19:44 2011
@@ -2,6 +2,7 @@
 application/x-pdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf; priority=5
 application/x-bzpdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf.bz2; priority=5
 application/x-gzpdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf.gz; priority=5
+application/x-xzpdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf.xz; priority=5
 application/postscript; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.ps; priority=5
 application/x-bzpostscript; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.ps.bz2; priority=5
 application/x-gzpostscript; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.ps.gz; priority=5

Modified: desktop/experimental/evince/debian/evince.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince.install?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince.install [utf-8] (original)
+++ desktop/experimental/evince/debian/evince.install [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,6 +1,4 @@
 debian/lintian/evince /usr/share/lintian/overrides/
-debian/tmp/etc
 debian/tmp/usr/bin
 debian/tmp/usr/lib/nautilus/*/*.so
 debian/tmp/usr/lib/evince/evinced
-debian/tmp/usr/lib/evince/evince-convert-metadata

Modified: desktop/experimental/evince/debian/evince.mime
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/evince.mime?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/evince.mime [utf-8] (original)
+++ desktop/experimental/evince/debian/evince.mime [utf-8] Thu Apr 14 14:19:44 2011
@@ -2,6 +2,7 @@
 application/x-pdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf; priority=5
 application/x-bzpdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf.bz2; priority=5
 application/x-gzpdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf.gz; priority=5
+application/x-xzpdf; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.pdf.xz; priority=5
 application/postscript; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.ps; priority=5
 application/x-bzpostscript; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.ps.bz2; priority=5
 application/x-gzpostscript; evince %s; test=test -n "$DISPLAY"; nametemplate=%s.ps.gz; priority=5

Copied: desktop/experimental/evince/debian/gir1.2-evince-3.0.install (from r27445, desktop/experimental/evince/debian/gir1.0-evince-2.30.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/gir1.2-evince-3.0.install?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/gir1.0-evince-2.30.install [utf-8] (original)
+++ desktop/experimental/evince/debian/gir1.2-evince-3.0.install [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,1 +1,2 @@
+debian/lintian/gir1.2-evince-3.0 /usr/share/lintian/overrides/
 debian/tmp/usr/lib/girepository-*

Copied: desktop/experimental/evince/debian/libevince3-3.install (from r27445, desktop/experimental/evince/debian/libevince2.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/libevince3-3.install?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/libevince2.install [utf-8] (original)
+++ desktop/experimental/evince/debian/libevince3-3.install [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,4 +1,4 @@
-debian/lintian/libevince2 /usr/share/lintian/overrides/
+debian/lintian/libevince3-3 /usr/share/lintian/overrides/
 debian/tmp/usr/lib/*.so.*
 debian/tmp/usr/lib/evince/*/backends/*.so
 debian/tmp/usr/lib/evince/*/backends/*.evince-backend

Added: desktop/experimental/evince/debian/lintian/evince-dbg
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/lintian/evince-dbg?rev=27562&op=file
==============================================================================
--- desktop/experimental/evince/debian/lintian/evince-dbg (added)
+++ desktop/experimental/evince/debian/lintian/evince-dbg [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,0 +1,3 @@
+#Our copyright file is more complex, but correct:
+evince-dbg: copyright-without-copyright-notice
+evince-dbg: copyright-refers-to-versionless-license-file

Added: desktop/experimental/evince/debian/lintian/gir1.2-evince-3.0
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/lintian/gir1.2-evince-3.0?rev=27562&op=file
==============================================================================
--- desktop/experimental/evince/debian/lintian/gir1.2-evince-3.0 (added)
+++ desktop/experimental/evince/debian/lintian/gir1.2-evince-3.0 [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,0 +1,3 @@
+#Our copyright file is more complex, but correct:
+gir1.2-evince-3.0: copyright-without-copyright-notice
+gir1.2-evince-3.0: copyright-refers-to-versionless-license-file

Copied: desktop/experimental/evince/debian/lintian/libevince3-3 (from r27445, desktop/experimental/evince/debian/lintian/libevince2)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/lintian/libevince3-3?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/lintian/libevince2 [utf-8] (original)
+++ desktop/experimental/evince/debian/lintian/libevince3-3 [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,3 +1,3 @@
 #Our copyright file is more complex, but correct:
-libevince2: copyright-without-copyright-notice
-libevince2: copyright-refers-to-versionless-license-file
+libevince3-3: copyright-without-copyright-notice
+libevince3-3: copyright-refers-to-versionless-license-file

Added: desktop/experimental/evince/debian/patches/00_gir-libdocument-library-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/patches/00_gir-libdocument-library-path.patch?rev=27562&op=file
==============================================================================
--- desktop/experimental/evince/debian/patches/00_gir-libdocument-library-path.patch (added)
+++ desktop/experimental/evince/debian/patches/00_gir-libdocument-library-path.patch [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,0 +1,12 @@
+diff --git a/libview/Makefile.am b/libview/Makefile.am
+index 7766c4b..2e8671e 100644
+--- a/libview/Makefile.am
++++ b/libview/Makefile.am
+@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte
+ 	--output $@ \
+ 	--pkg evince-document-$(EV_API_VERSION) \
+ 	--pkg evince-view-$(EV_API_VERSION) \
++	-L$(top_builddir)/libdocument/ \
+ 	-I$(top_srcdir) \
+ 	-I$(top_builddir) \
+ 	-DEVINCE_COMPILATION \

Modified: desktop/experimental/evince/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/patches/series?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/patches/series [utf-8] (original)
+++ desktop/experimental/evince/debian/patches/series [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,1 +1,1 @@
-01_dvi_security.patch
+00_gir-libdocument-library-path.patch

Modified: desktop/experimental/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/evince/debian/rules?rev=27562&op=diff
==============================================================================
--- desktop/experimental/evince/debian/rules [utf-8] (original)
+++ desktop/experimental/evince/debian/rules [utf-8] Thu Apr 14 14:19:44 2011
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
@@ -15,13 +17,11 @@
 			--enable-djvu \
 			--enable-dvi \
 			--enable-t1lib \
-			--enable-pixbuf \
 			--enable-comics \
-			--enable-impress \
 			--enable-introspection=yes
 
 DEB_DH_MAKESHLIBS_ARGS += --exclude=libevince-properties-page.so \
-	-V'libevince2 (>= 2.30.1)'
+	-V'libevince3-3 (>= 3.0.0)'
 
 DEB_DH_STRIP_ARGS_evince-gtk = --dbg-package=
 
@@ -37,9 +37,7 @@
 			$(cdbs_configure_flags) \
 			$(DEB_CONFIGURE_EXTRA_FLAGS) \
 			--without-keyring \
-			--without-gconf \
 			--disable-nautilus \
-			--disable-dbus \
 			--enable-introspection=no \
 			--disable-gtk-doc \
 			$(DEB_CONFIGURE_USER_FLAGS)
@@ -56,7 +54,7 @@
 	rm -rf debian/evince-gtk/usr/lib/nautilus
 	rm -rf debian/evince-gtk/usr/lib/pkgconfig
 	rm -rf debian/evince-gtk/usr/lib/girepository*
-	rm -rf debian/evince-gtk/usr/lib/evince/2
+	rm -rf debian/evince-gtk/usr/lib/evince/3
 
 binary-install/evince-common::
 	rm -rf debian/evince-common/usr/share/gtk-doc
@@ -66,5 +64,5 @@
 	desktop-check-mime-types
 
 common-binary-fixup-arch::
-	dh_girepository -pgir1.0-evince-2.30
+	dh_girepository -pgir1.2-evince-3.0
 




More information about the pkg-gnome-commits mailing list