r49977 - in /desktop/unstable/gnome-documents/debian: changelog control control.in patches/91_hide-gnome-books.patch patches/revert-new-autoconf-archive-macros.patch patches/series

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Fri Sep 2 03:35:32 UTC 2016


Author: jbicha-guest
Date: Fri Sep  2 03:35:32 2016
New Revision: 49977

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49977
Log:
New upstream release

* debian/control.in:
  - Build-depend on autoconf-archive instead of gnome-common
  - Build-depend and depend on libgepub for new epub support
* debian/patches/revert-new-autoconf-archive-macros.patch:
  - Don't require autoconf-archive 2016.03.20 yet
* debian/patches/91_hide-gnome-books.patch:
  - Don't hide the Books app since it now support epubs

Added:
    desktop/unstable/gnome-documents/debian/patches/revert-new-autoconf-archive-macros.patch
Removed:
    desktop/unstable/gnome-documents/debian/patches/91_hide-gnome-books.patch
Modified:
    desktop/unstable/gnome-documents/debian/changelog
    desktop/unstable/gnome-documents/debian/control
    desktop/unstable/gnome-documents/debian/control.in
    desktop/unstable/gnome-documents/debian/patches/series

Modified: desktop/unstable/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/changelog?rev=49977&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/changelog	[utf-8] Fri Sep  2 03:35:32 2016
@@ -1,3 +1,16 @@
+gnome-documents (3.21.90-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * debian/control.in:
+    - Build-depend on autoconf-archive instead of gnome-common
+    - Build-depend and depend on libgepub for new epub support
+  * debian/patches/revert-new-autoconf-archive-macros.patch:
+    - Don't require autoconf-archive 2016.03.20 yet
+  * debian/patches/91_hide-gnome-books.patch:
+    - Don't hide the Books app since it now support epubs
+
+ -- Jeremy Bicha <jbicha at ubuntu.com>  Thu, 01 Sep 2016 22:55:04 -0400
+
 gnome-documents (3.20.1-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control?rev=49977&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control	[utf-8] Fri Sep  2 03:35:32 2016
@@ -7,11 +7,11 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: dh-autoreconf,
+Build-Depends: autoconf-archive,
+               dh-autoreconf,
                debhelper (>= 9),
                desktop-file-utils,
                gnome-pkg-tools (>= 0.10),
-               gnome-common,
                intltool (>= 0.50.1),
                gjs,
                gobject-introspection (>= 1.31.6),

Modified: desktop/unstable/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control.in?rev=49977&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control.in	[utf-8] Fri Sep  2 03:35:32 2016
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: dh-autoreconf,
+Build-Depends: autoconf-archive,
+               dh-autoreconf,
                debhelper (>= 9),
                desktop-file-utils,
                gnome-pkg-tools (>= 0.10),
-               gnome-common,
                intltool (>= 0.50.1),
                gjs,
                gobject-introspection (>= 1.31.6),
@@ -15,6 +15,7 @@
                inkscape,
                libevince-dev (>= 3.13.3),
                libgdata-dev (>= 0.13.3),
+               libgepub-dev (>= 0.4),
                libgirepository1.0-dev (>= 1.31.6),
                libgjs-dev (>= 1.40),
                libglib2.0-dev (>= 2.39.3),
@@ -42,6 +43,7 @@
          gnome-online-miners,
          gir1.2-evince-3.0,
          gir1.2-gdata-0.0,
+         gir1.2-gepub-0.4,
          gir1.2-gnomedesktop-3.0,
          gir1.2-goa-1.0,
          gir1.2-gtk-3.0,

Added: desktop/unstable/gnome-documents/debian/patches/revert-new-autoconf-archive-macros.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/revert-new-autoconf-archive-macros.patch?rev=49977&op=file
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/revert-new-autoconf-archive-macros.patch	(added)
+++ desktop/unstable/gnome-documents/debian/patches/revert-new-autoconf-archive-macros.patch	[utf-8] Fri Sep  2 03:35:32 2016
@@ -0,0 +1,46 @@
+From 9b480bd0c08de94529a1aa3be4552e847ed7c061 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento at gmail.com>
+Date: Wed, 30 Mar 2016 22:57:39 -0700
+Subject: build: Check for GJS GIRs with new macros
+
+This uses the new AX_PROG_GJS, AX_CHECK_GIRS_GJS, and
+AX_CHECK_GIR_SYMBOLS_GJS macros in autoconf-archive to check for the
+GJS path and the necessary GIR files in configure.ac
+
+https://bugzilla.gnome.org/show_bug.cgi?id=766460
+---
+ configure.ac | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+Index: gnome-documents-3.21.90/configure.ac
+===================================================================
+--- gnome-documents-3.21.90.orig/configure.ac
++++ gnome-documents-3.21.90/configure.ac
+@@ -104,26 +104,7 @@ LIBGD_INIT([
+   gir
+ ])
+ 
+-AX_PROG_GJS
+-AX_CHECK_GIRS_GJS([cairo], [1.0])
+-AX_CHECK_GIRS_GJS([EvinceDocument], [3.0])
+-AX_CHECK_GIRS_GJS([EvinceView], [3.0])
+-AX_CHECK_GIRS_GJS([GData], [0.0])
+-AX_CHECK_GIRS_GJS([Gdk], [3.0])
+-AX_CHECK_GIRS_GJS([GdkPixbuf], [2.0])
+-AX_CHECK_GIR_SYMBOLS_GJS([Gio], [2.0], [ActionMap.add_action])
+-AX_CHECK_GIRS_GJS([GLib], [2.0])
+-AX_CHECK_GIRS_GJS([GnomeDesktop], [3.0])
+-AX_CHECK_GIRS_GJS([Goa], [1.0])
+-AX_CHECK_GIRS_GJS([GObject], [2.0])
+-AX_CHECK_GIR_SYMBOLS_GJS([Gtk], [3.0], [ShortcutsWindow ShortcutsSection
+-  ShortcutsGroup ShortcutsShortcut])
+-AX_CHECK_GIRS_GJS([Pango], [1.0])
+-AX_CHECK_GIRS_GJS([Tracker], [1.0])
+-AX_CHECK_GIRS_GJS([TrackerControl], [1.0])
+-AX_CHECK_GIRS_GJS([WebKit2], [4.0])
+-AX_CHECK_GIRS_GJS([Zpj], [0.0])
+-AX_CHECK_GIRS_GJS([Gepub], [0.3])
++AC_PATH_PROG([GJS],[gjs])
+ 
+ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
+ AC_SUBST(GLIB_COMPILE_RESOURCES)

Modified: desktop/unstable/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/series?rev=49977&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/series	[utf-8] Fri Sep  2 03:35:32 2016
@@ -1,3 +1,3 @@
 90_drop-onlyshowin.patch
-91_hide-gnome-books.patch
 gnome-documents-xdg-fail.patch
+revert-new-autoconf-archive-macros.patch




More information about the pkg-gnome-commits mailing list