r19961 - in /desktop/unstable/evince/debian: changelog control control.in evince-gtk.install evince-gtk.manpages evince-gtk.menu evince-gtk.mime evince.install evince.lintian-override lintian/ lintian/evince lintian/evince-gtk rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu May 14 07:21:02 UTC 2009
Author: joss
Date: Thu May 14 07:21:02 2009
New Revision: 19961
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19961
Log:
* Remove useless build-dependency on libglade.
* New upstream release.
* Really install the lintian override.
* Reinstate evince-gtk, since we can now disable GConf and
gnome-keyring.
* Don’t install .la and .a files in the moved places.
Added:
desktop/unstable/evince/debian/evince-gtk.install
- copied, changed from r19954, desktop/unstable/evince/debian/evince.install
desktop/unstable/evince/debian/evince-gtk.manpages
- copied unchanged from r19954, desktop/unstable/evince/debian/evince.manpages
desktop/unstable/evince/debian/evince-gtk.menu
- copied unchanged from r19954, desktop/unstable/evince/debian/evince.menu
desktop/unstable/evince/debian/evince-gtk.mime
- copied unchanged from r19954, desktop/unstable/evince/debian/evince.mime
desktop/unstable/evince/debian/lintian/
desktop/unstable/evince/debian/lintian/evince
- copied unchanged from r19954, desktop/unstable/evince/debian/evince.lintian-override
desktop/unstable/evince/debian/lintian/evince-gtk
- copied, changed from r19954, desktop/unstable/evince/debian/evince.lintian-override
Removed:
desktop/unstable/evince/debian/evince.lintian-override
Modified:
desktop/unstable/evince/debian/changelog
desktop/unstable/evince/debian/control
desktop/unstable/evince/debian/control.in
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=19961&op=diff
==============================================================================
--- desktop/unstable/evince/debian/changelog (original)
+++ desktop/unstable/evince/debian/changelog Thu May 14 07:21:02 2009
@@ -1,4 +1,4 @@
-evince (2.26.0-1) UNRELEASED; urgency=low
+evince (2.26.1-1) unstable; urgency=low
[ Josselin Mouette ]
* Section of evince-dbg is debug.
@@ -18,7 +18,15 @@
- libgnome-keyring-dev to 2.22.0.
+ Update Standards-Version to 3.8.1. No changes needed.
- -- Luca Bruno <lethalman88 at gmail.com> Sun, 22 Mar 2009 20:45:22 +0100
+ [ Josselin Mouette ]
+ * Remove useless build-dependency on libglade.
+ * New upstream release.
+ * Really install the lintian override.
+ * Reinstate evince-gtk, since we can now disable GConf and
+ gnome-keyring.
+ * Don’t install .la and .a files in the moved places.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 14 May 2009 08:27:03 +0200
evince (2.24.2-2) unstable; urgency=low
Modified: desktop/unstable/evince/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control?rev=19961&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control (original)
+++ desktop/unstable/evince/debian/control Thu May 14 07:21:02 2009
@@ -10,7 +10,6 @@
gnome-doc-utils (>= 0.3.2),
libglib2.0-dev (>= 2.18.0),
libgtk2.0-dev (>= 2.12.0),
- libglade2-dev,
libgconf2-dev,
libnautilus-extension-dev,
libgnome-keyring-dev (>= 2.22.0),
@@ -32,7 +31,6 @@
Package: evince
Conflicts: evince-gtk
-Replaces: evince-gtk
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -42,8 +40,7 @@
gvfs
Provides: pdf-viewer,
postscript-viewer,
- djvu-viewer,
- evince-gtk
+ djvu-viewer
Suggests: unrar, poppler-data, nautilus
Description: Document (postscript, pdf) viewer
Evince is a simple multi-page document viewer. It can display and print
@@ -68,3 +65,45 @@
table-of-contents bookmarks.
.
This package contains the debugging symbols needed by gdb.
+
+Package: evince-gtk
+Conflicts: 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: gvfs, unrar, poppler-data, nautilus
+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 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
+ 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 GConf and GNOME keyring
+ support.
+ .
+ This package contains the debugging symbols needed by gdb.
Modified: desktop/unstable/evince/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/control.in?rev=19961&op=diff
==============================================================================
--- desktop/unstable/evince/debian/control.in (original)
+++ desktop/unstable/evince/debian/control.in Thu May 14 07:21:02 2009
@@ -10,7 +10,6 @@
gnome-doc-utils (>= 0.3.2),
libglib2.0-dev (>= 2.18.0),
libgtk2.0-dev (>= 2.12.0),
- libglade2-dev,
libgconf2-dev,
libnautilus-extension-dev,
libgnome-keyring-dev (>= 2.22.0),
@@ -32,7 +31,6 @@
Package: evince
Conflicts: evince-gtk
-Replaces: evince-gtk
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
@@ -42,8 +40,7 @@
gvfs
Provides: pdf-viewer,
postscript-viewer,
- djvu-viewer,
- evince-gtk
+ djvu-viewer
Suggests: unrar, poppler-data, nautilus
Description: Document (postscript, pdf) viewer
Evince is a simple multi-page document viewer. It can display and print
@@ -68,3 +65,45 @@
table-of-contents bookmarks.
.
This package contains the debugging symbols needed by gdb.
+
+Package: evince-gtk
+Conflicts: 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: gvfs, unrar, poppler-data, nautilus
+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 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
+ 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 GConf and GNOME keyring
+ support.
+ .
+ This package contains the debugging symbols needed by gdb.
Copied: desktop/unstable/evince/debian/evince-gtk.install (from r19954, desktop/unstable/evince/debian/evince.install)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/evince-gtk.install?rev=19961&op=diff
==============================================================================
--- desktop/unstable/evince/debian/evince.install (original)
+++ desktop/unstable/evince/debian/evince-gtk.install Thu May 14 07:21:02 2009
@@ -1,2 +1,2 @@
-debian/evince.lintian-override /usr/share/lintian/overrides/
+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=19961&op=diff
==============================================================================
--- desktop/unstable/evince/debian/evince.install (original)
+++ desktop/unstable/evince/debian/evince.install Thu May 14 07:21:02 2009
@@ -1,2 +1,2 @@
-debian/evince.lintian-override /usr/share/lintian/overrides/
+debian/lintian/evince /usr/share/lintian/overrides/
debian/evince.xpm /usr/share/pixmaps/
Copied: desktop/unstable/evince/debian/lintian/evince-gtk (from r19954, desktop/unstable/evince/debian/evince.lintian-override)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/lintian/evince-gtk?rev=19961&op=diff
==============================================================================
--- desktop/unstable/evince/debian/evince.lintian-override (original)
+++ desktop/unstable/evince/debian/lintian/evince-gtk Thu May 14 07:21:02 2009
@@ -1,2 +1,2 @@
#Our copyright file is more complex, but correct:
-evince: copyright-without-copyright-notice
+evince-gtk: copyright-without-copyright-notice
Modified: desktop/unstable/evince/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/evince/debian/rules?rev=19961&op=diff
==============================================================================
--- desktop/unstable/evince/debian/rules (original)
+++ desktop/unstable/evince/debian/rules Thu May 14 07:21:02 2009
@@ -6,7 +6,10 @@
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 \
@@ -16,18 +19,53 @@
--enable-impress
DEB_DH_MAKESHLIBS_ARGS += --exclude=libevince-properties-page.so
-DEB_DH_SHLIBDEPS_ARGS_evince += --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-keyring --without-gconf --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::
rm -rf debian/evince/usr/share/gtk-doc
#No development package:
- rm -rf debian/evince/usr/lib/nautilus/*/*a debian/evince/usr/lib/*a debian/evince/usr/lib/evince/*/*a debian/evince/usr/include/ \
- debian/evince/usr/lib/libevbackend.so debian/evince/usr/lib/libevview.so debian/evince/usr/lib/libevdocument.so
+ 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/*.so
+
+binary-install/evince::
+ rm -rf debian/evince-gtk/usr/share/gtk-doc
+ #No development package:
+ rm -rf debian/evince-gtk/usr/lib/nautilus \
+ debian/evince-gtk/usr/lib/evince/*/backends/*a \
+ debian/evince-gtk/usr/lib/*a \
+ debian/evince-gtk/usr/include/ \
+ debian/evince-gtk/usr/lib/*.so
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-post-install/evince::
# check for missing MIME types
desktop-check-mime-types
More information about the pkg-gnome-commits
mailing list