r20317 - in /desktop/unstable/evince/debian: ./ lintian/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Jun 10 21:03:29 UTC 2009
Author: joss
Date: Wed Jun 10 21:03:28 2009
New Revision: 20317
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20317
Log:
* New upstream release.
* debian/control.in:
- Split libevince1, libevince-dev and libevince-doc to expose evince
rendering and widgets development API.
These packages include libevdocument and libevview libraries.
- Split evince-backends which files are shared by evince and evince-gtk
binary packages.
- Split evince-common containing platform-independent files shared between
evince and evince-gtk packages.
* debian/evince.manpages, debian/evince-gtk.manpages:
- Moved to evince-common.manpages as they shared the evince-thumbnailer
manpage and because evince manpage is installed by evince-common.
* debian/rules:
- Install under debian/tmp by default.
- Enable gtk-doc, added install rule for evince-common to delete gtk-doc
files.
- Link evince and evince-gtk docs to evince-common docs.
* debian/lintian/{evince-backends, evince-common, libevince1, libevince-dev,
libevince-doc}:
- Added.
* Don’t install any .la’s, and only the relevant .a’s.
* Use ${gnome:Depends}.
* Remove evince-gtk-dbg, the differences with evince are minor now and
it will not work with the backends. Let’s hope the build-ids come
soon to fix that mess.
* Don’t split the docs, given their size.
* Ship the backends with the library; the library needs them anyway,
and they are in a correctly versioned directory.
* Install evince-thumbnailer.1 in evince-common.
* Install the XPM in evince-common.
* Fixup some dependencies.
Added:
desktop/unstable/evince/debian/evince-common.install
desktop/unstable/evince/debian/evince-common.manpages
desktop/unstable/evince/debian/libevince-dev.install
desktop/unstable/evince/debian/libevince-doc.install
desktop/unstable/evince/debian/libevince1.install
desktop/unstable/evince/debian/lintian/evince-common
desktop/unstable/evince/debian/lintian/libevince-dev
desktop/unstable/evince/debian/lintian/libevince1
Removed:
desktop/unstable/evince/debian/evince-gtk.manpages
desktop/unstable/evince/debian/evince.manpages
Modified:
desktop/unstable/evince/debian/changelog
desktop/unstable/evince/debian/control
desktop/unstable/evince/debian/control.in
desktop/unstable/evince/debian/evince-gtk.install
desktop/unstable/evince/debian/evince.install
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=20317&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog (original)
+++ desktop/unstable/evince/debian/changelog Wed Jun 10 21:03:28 2009
@@ -1,3 +1,42 @@
+evince (2.26.2-1) unstable; urgency=low
+
+ [ Luca Bruno ]
+ * New upstream release.
+ * debian/control.in:
+ - Split libevince1, libevince-dev and libevince-doc to expose evince
+ rendering and widgets development API.
+ These packages include libevdocument and libevview libraries.
+ - Split evince-backends which files are shared by evince and evince-gtk
+ binary packages.
+ - Split evince-common containing platform-independent files shared between
+ evince and evince-gtk packages.
+ * debian/evince.manpages, debian/evince-gtk.manpages:
+ - Moved to evince-common.manpages as they shared the evince-thumbnailer
+ manpage and because evince manpage is installed by evince-common.
+ * debian/rules:
+ - Install under debian/tmp by default.
+ - Enable gtk-doc, added install rule for evince-common to delete gtk-doc
+ files.
+ - Link evince and evince-gtk docs to evince-common docs.
+ * debian/lintian/{evince-backends, evince-common, libevince1, libevince-dev,
+ libevince-doc}:
+ - Added.
+
+ [ Josselin Mouette ]
+ * Don’t install any .la’s, and only the relevant .a’s.
+ * Use ${gnome:Depends}.
+ * Remove evince-gtk-dbg, the differences with evince are minor now and
+ it will not work with the backends. Let’s hope the build-ids come
+ soon to fix that mess.
+ * Don’t split the docs, given their size.
+ * Ship the backends with the library; the library needs them anyway,
+ and they are in a correctly versioned directory.
+ * Install evince-thumbnailer.1 in evince-common.
+ * Install the XPM in evince-common.
+ * Fixup some dependencies.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 10 Jun 2009 22:41:12 +0200
+
evince (2.26.1-2) unstable; urgency=low
* Update build dependencies to the current version. Closes: #528717.
Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=20317&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control (original)
+++ desktop/unstable/evince/debian/control Wed Jun 10 21:03:28 2009
@@ -34,6 +34,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ libevince1 (= ${binary:Version}),
+ evince-common (>= ${gnome:Version}),
+ evince-common (<< ${gnome:NextVersion}),
gnome-icon-theme (>= 2.17.1),
shared-mime-info
Recommends: dbus-x11,
@@ -55,7 +58,8 @@
Priority: extra
Architecture: any
Depends: ${misc:Depends},
- evince (= ${binary:Version})
+ evince (= ${binary:Version}),
+ libevince1 (= ${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
@@ -71,6 +75,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ libevince1 (= ${binary:Version}),
+ evince-common (>= ${gnome:Version}),
+ evince-common (<< ${gnome:NextVersion}),
gnome-icon-theme (>= 2.17.1),
shared-mime-info
Recommends: dbus-x11
@@ -89,13 +96,11 @@
This version of evince is built without GConf and GNOME keyring
support.
-Package: evince-gtk-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends},
- evince-gtk (= ${binary:Version})
-Description: Document (postscript, pdf) viewer (GTK+ version) - debugging symbols
+Package: evince-common
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: evince (<< 2.26.2), evince-gtk (<< 2.26.2)
+Description: Document (postscript, pdf) viewer - common files
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.
@@ -103,7 +108,36 @@
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 package contains shared files for evince and evince-gtk packages.
+
+Package: libevince1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: evince (<< 2.26.2), evince-gtk (<< 2.26.2)
+Description: Document (postscript, pdf) rendering library
+ This package contains evince-related libraries for rendering and displaying
+ Evince documents like PostScript (PS), Encapsulated PostScript (EPS), DJVU,
+ DVI and Portable Document Format (PDF) files.
+ * libevdocument, which performs the rendering of the documents
+ * libevview, which provides GTK+ widgets for displaying documents
.
- This package contains the debugging symbols needed by gdb.
+ It is shipped with the ps, pdf, dvi, impress, tiff, djvu, comics and
+ pixbuf backends.
+
+Package: libevince-dev
+Architecture: any
+Section: libdevel
+Depends: libevince1 (= ${binary:Version}),
+ ${misc:Depends}
+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
+ Evince documents like PostScript (PS), Encapsulated PostScript (EPS), DJVU,
+ DVI and Portable Document Format (PDF) files.
+ * libevdocument, which performs the rendering of the documents
+ * libevview, which provides GTK+ widgets for displaying documents
+ .
+ This package provides the development headers, static libraries and
+ documentation.
Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=20317&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in (original)
+++ desktop/unstable/evince/debian/control.in Wed Jun 10 21:03:28 2009
@@ -34,6 +34,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ libevince1 (= ${binary:Version}),
+ evince-common (>= ${gnome:Version}),
+ evince-common (<< ${gnome:NextVersion}),
gnome-icon-theme (>= 2.17.1),
shared-mime-info
Recommends: dbus-x11,
@@ -55,7 +58,8 @@
Priority: extra
Architecture: any
Depends: ${misc:Depends},
- evince (= ${binary:Version})
+ evince (= ${binary:Version}),
+ libevince1 (= ${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
@@ -71,6 +75,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ libevince1 (= ${binary:Version}),
+ evince-common (>= ${gnome:Version}),
+ evince-common (<< ${gnome:NextVersion}),
gnome-icon-theme (>= 2.17.1),
shared-mime-info
Recommends: dbus-x11
@@ -89,13 +96,11 @@
This version of evince is built without GConf and GNOME keyring
support.
-Package: evince-gtk-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: ${misc:Depends},
- evince-gtk (= ${binary:Version})
-Description: Document (postscript, pdf) viewer (GTK+ version) - debugging symbols
+Package: evince-common
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: evince (<< 2.26.2), evince-gtk (<< 2.26.2)
+Description: Document (postscript, pdf) viewer - common files
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.
@@ -103,7 +108,36 @@
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 package contains shared files for evince and evince-gtk packages.
+
+Package: libevince1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: evince (<< 2.26.2), evince-gtk (<< 2.26.2)
+Description: Document (postscript, pdf) rendering library
+ This package contains evince-related libraries for rendering and displaying
+ Evince documents like PostScript (PS), Encapsulated PostScript (EPS), DJVU,
+ DVI and Portable Document Format (PDF) files.
+ * libevdocument, which performs the rendering of the documents
+ * libevview, which provides GTK+ widgets for displaying documents
.
- This package contains the debugging symbols needed by gdb.
+ It is shipped with the ps, pdf, dvi, impress, tiff, djvu, comics and
+ pixbuf backends.
+
+Package: libevince-dev
+Architecture: any
+Section: libdevel
+Depends: libevince1 (= ${binary:Version}),
+ ${misc:Depends}
+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
+ Evince documents like PostScript (PS), Encapsulated PostScript (EPS), DJVU,
+ DVI and Portable Document Format (PDF) files.
+ * libevdocument, which performs the rendering of the documents
+ * libevview, which provides GTK+ widgets for displaying documents
+ .
+ This package provides the development headers, static libraries and
+ documentation.
Added: desktop/unstable/evince/debian/evince-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince-common.install?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/evince-common.install (added)
+++ desktop/unstable/evince/debian/evince-common.install Wed Jun 10 21:03:28 2009
@@ -1,0 +1,3 @@
+debian/lintian/evince-common /usr/share/lintian/overrides/
+debian/evince.xpm /usr/share/pixmaps/
+debian/tmp/usr/share
Added: desktop/unstable/evince/debian/evince-common.manpages
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince-common.manpages?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/evince-common.manpages (added)
+++ desktop/unstable/evince/debian/evince-common.manpages Wed Jun 10 21:03:28 2009
@@ -1,0 +1,1 @@
+debian/evince-thumbnailer.1
Modified: desktop/unstable/evince/debian/evince-gtk.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince-gtk.install?rev=20317&op=diff
==============================================================================
--- desktop/unstable/evince/debian/evince-gtk.install (original)
+++ desktop/unstable/evince/debian/evince-gtk.install Wed Jun 10 21:03:28 2009
@@ -1,2 +1,1 @@
debian/lintian/evince-gtk /usr/share/lintian/overrides/
-debian/evince.xpm /usr/share/pixmaps/
Modified: desktop/unstable/evince/debian/evince.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince.install?rev=20317&op=diff
==============================================================================
--- desktop/unstable/evince/debian/evince.install (original)
+++ desktop/unstable/evince/debian/evince.install Wed Jun 10 21:03:28 2009
@@ -1,2 +1,5 @@
debian/lintian/evince /usr/share/lintian/overrides/
-debian/evince.xpm /usr/share/pixmaps/
+debian/tmp/etc
+debian/tmp/usr/bin
+debian/tmp/usr/lib/nautilus/*/*.so
+debian/tmp/usr/share/man
Added: desktop/unstable/evince/debian/libevince-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevince-dev.install?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/libevince-dev.install (added)
+++ desktop/unstable/evince/debian/libevince-dev.install Wed Jun 10 21:03:28 2009
@@ -1,0 +1,5 @@
+debian/lintian/libevince-dev /usr/share/lintian/overrides/
+debian/tmp/usr/lib/*.a
+debian/tmp/usr/include
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*.so
Added: desktop/unstable/evince/debian/libevince-doc.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevince-doc.install?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/libevince-doc.install (added)
+++ desktop/unstable/evince/debian/libevince-doc.install Wed Jun 10 21:03:28 2009
@@ -1,0 +1,2 @@
+debian/lintian/libevince-doc /usr/share/lintian/overrides/
+debian/tmp/usr/share/gtk-doc
Added: desktop/unstable/evince/debian/libevince1.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/libevince1.install?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/libevince1.install (added)
+++ desktop/unstable/evince/debian/libevince1.install Wed Jun 10 21:03:28 2009
@@ -1,0 +1,4 @@
+debian/lintian/libevince1 /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/unstable/evince/debian/lintian/evince-common
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/lintian/evince-common?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/lintian/evince-common (added)
+++ desktop/unstable/evince/debian/lintian/evince-common Wed Jun 10 21:03:28 2009
@@ -1,0 +1,3 @@
+#Our copyright file is more complex, but correct:
+evince-common: copyright-without-copyright-notice
+evince-common: copyright-refers-to-versionless-license-file
Added: desktop/unstable/evince/debian/lintian/libevince-dev
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/lintian/libevince-dev?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/lintian/libevince-dev (added)
+++ desktop/unstable/evince/debian/lintian/libevince-dev Wed Jun 10 21:03:28 2009
@@ -1,0 +1,3 @@
+#Our copyright file is more complex, but correct:
+libevince-dev: copyright-without-copyright-notice
+libevince-dev: copyright-refers-to-versionless-license-file
Added: desktop/unstable/evince/debian/lintian/libevince1
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/lintian/libevince1?rev=20317&op=file
==============================================================================
--- desktop/unstable/evince/debian/lintian/libevince1 (added)
+++ desktop/unstable/evince/debian/lintian/libevince1 Wed Jun 10 21:03:28 2009
@@ -1,0 +1,3 @@
+#Our copyright file is more complex, but correct:
+libevince1: copyright-without-copyright-notice
+libevince1: copyright-refers-to-versionless-license-file
Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=20317&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules (original)
+++ desktop/unstable/evince/debian/rules Wed Jun 10 21:03:28 2009
@@ -4,14 +4,15 @@
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/gnome-version.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-gtk-doc \
--enable-djvu \
--enable-dvi \
--enable-t1lib \
@@ -40,35 +41,29 @@
install/evince-gtk::
make -C $(DEB_BUILDDIR_evince-gtk) install DESTDIR=$(DEB_DESTDIR_evince-gtk)
+ rm -rf debian/evince-gtk/usr/share \
+ debian/evince-gtk/etc \
+ debian/evince-gtk/usr/lib \
+ debian/evince-gtk/usr/include
-install/evince::
- rm -rf debian/evince/usr/share/gtk-doc
- #No development package, no nautilus/GConf stuff
- rm -rf debian/evince/usr/lib/nautilus/*/*a \
- debian/evince/usr/lib/evince/*/backends/*a \
- debian/evince/usr/lib/*a \
- debian/evince/usr/include/ \
- debian/evince/usr/lib/pkgconfig \
- debian/evince/usr/lib/*.so
+install/evince-common::
+ rm -rf debian/evince-common/usr/share/gtk-doc
-install/evince-gtk::
- rm -rf debian/evince-gtk/usr/share/gtk-doc
- #No development package:
- rm -rf debian/evince-gtk/usr/lib/nautilus \
- debian/evince-gtk/etc \
- debian/evince-gtk/usr/lib/evince/*/backends/*a \
- debian/evince-gtk/usr/lib/*a \
- debian/evince-gtk/usr/include/ \
- debian/evince-gtk/usr/lib/pkgconfig \
- debian/evince-gtk/usr/lib/*.so
+binary-install/evince::
+ rm -rf debian/evince/usr/share/doc/evince
+ dh_link -pevince usr/share/doc/evince-common usr/share/doc/evince
+
+binary-install/evince-gtk::
+ rm -rf debian/evince-gtk/usr/share/doc/evince-gtk
+ dh_link -pevince-gtk usr/share/doc/evince-common usr/share/doc/evince-gtk
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-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-install/libevince-dev::
+ rm -rf debian/libevince-dev/usr/share/doc/libevince-dev
+ dh_link -plibevince-dev usr/share/doc/libevince1 usr/share/doc/libevince-dev
binary-post-install/evince::
# check for missing MIME types
More information about the pkg-gnome-commits
mailing list