r36485 - in /desktop/experimental/gnome-documents/debian: changelog control control.in patches/91_link_gdminer_to_gdprivate.patch patches/series
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Sun Dec 16 22:28:29 UTC 2012
Author: ah
Date: Sun Dec 16 22:28:28 2012
New Revision: 36485
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36485
Log:
New upstream release.
Added:
desktop/experimental/gnome-documents/debian/patches/91_link_gdminer_to_gdprivate.patch
Modified:
desktop/experimental/gnome-documents/debian/changelog
desktop/experimental/gnome-documents/debian/control
desktop/experimental/gnome-documents/debian/control.in
desktop/experimental/gnome-documents/debian/patches/series
Modified: desktop/experimental/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/changelog?rev=36485&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/changelog [utf-8] Sun Dec 16 22:28:28 2012
@@ -1,10 +1,18 @@
-gnome-documents (3.6.1-1) UNRELEASED; urgency=low
+gnome-documents (3.6.2-1) experimental; urgency=low
- * New upstream release.
+ [ Jeremy Bicha ]
+ * New upstream release (v3.6.1).
* debian/control.in:
- Update dependencies
- -- Jeremy Bicha <jbicha at ubuntu.com> Sat, 20 Oct 2012 23:31:52 -0400
+ [ Andreas Henriksson ]
+ * New upstream release (v3.6.2).
+ * Bump libzapojit-dev and libgdata-dev build-dependencies to include *-2
+ package revision with fixed dependencies, w.r.t. pkg-config.
+ * Add debian/patches/91_link_gdminer_to_gdprivate.patch
+ - fix build (link) failure, picked from upstream git commit c8933107.
+
+ -- Andreas Henriksson <andreas at fatal.se> Sun, 16 Dec 2012 23:22:30 +0100
gnome-documents (0.4.2-1) unstable; urgency=low
Modified: desktop/experimental/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/control?rev=36485&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/control [utf-8] Sun Dec 16 22:28:28 2012
@@ -2,11 +2,12 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
+
Source: gnome-documents
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
gnome-common,
@@ -15,7 +16,7 @@
gobject-introspection (>= 1.31.6),
libclutter-gtk-1.0-dev (>= 1.3.2),
libevince-dev (>= 3.3.0),
- libgdata-dev (>= 0.13.1),
+ libgdata-dev (>= 0.13.1-2),
libgirepository1.0-dev (>= 1.31.6),
libgjs-dev,
libglib2.0-dev (>= 2.31.6),
@@ -24,7 +25,7 @@
libgtk-3-dev (>= 3.5.5),
libtracker-miner-0.14-dev (>= 0.14.0),
libtracker-sparql-0.14-dev (>= 0.14.0),
- libzapojit-dev (>= 0.0.2)
+ libzapojit-dev (>= 0.0.2-2)
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-documents
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-documents/
Modified: desktop/experimental/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/control.in?rev=36485&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/control.in [utf-8] Sun Dec 16 22:28:28 2012
@@ -11,7 +11,7 @@
gobject-introspection (>= 1.31.6),
libclutter-gtk-1.0-dev (>= 1.3.2),
libevince-dev (>= 3.3.0),
- libgdata-dev (>= 0.13.1),
+ libgdata-dev (>= 0.13.1-2),
libgirepository1.0-dev (>= 1.31.6),
libgjs-dev,
libglib2.0-dev (>= 2.31.6),
@@ -20,7 +20,7 @@
libgtk-3-dev (>= 3.5.5),
libtracker-miner-0.14-dev (>= 0.14.0),
libtracker-sparql-0.14-dev (>= 0.14.0),
- libzapojit-dev (>= 0.0.2)
+ libzapojit-dev (>= 0.0.2-2)
Standards-Version: 3.9.3
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-documents
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-documents/
Added: desktop/experimental/gnome-documents/debian/patches/91_link_gdminer_to_gdprivate.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/patches/91_link_gdminer_to_gdprivate.patch?rev=36485&op=file
==============================================================================
--- desktop/experimental/gnome-documents/debian/patches/91_link_gdminer_to_gdprivate.patch (added)
+++ desktop/experimental/gnome-documents/debian/patches/91_link_gdminer_to_gdprivate.patch [utf-8] Sun Dec 16 22:28:28 2012
@@ -1,0 +1,20 @@
+commit c8933107aa4710fa8701bb412ab08e47b2001e01
+Author: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Wed Nov 7 17:08:08 2012 -0500
+
+ build: make sure to link libgdminer to libgdprivate
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=687822
+
+diff --git a/src/Makefile-miner.am b/src/Makefile-miner.am
+index 31a94c9..9d7a671 100644
+--- a/src/Makefile-miner.am
++++ b/src/Makefile-miner.am
+@@ -17,6 +17,7 @@ libgdminer_1_0_la_CPPFLAGS = \
+
+ libgdminer_1_0_la_LIBADD = \
+ $(DOCUMENTS_LIBS) \
++ libgdprivate-1.0.la \
+ $(NULL)
+
+ libgdminer_1_0_la_LDFLAGS = \
Modified: desktop/experimental/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/patches/series?rev=36485&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/patches/series [utf-8] Sun Dec 16 22:28:28 2012
@@ -1,2 +1,3 @@
02-no-gettext.patch
90_drop-onlyshowin.patch
+91_link_gdminer_to_gdprivate.patch
More information about the pkg-gnome-commits
mailing list