r53851 - in /desktop/unstable/gnome-documents/debian: changelog control control.in patches/90_drop-onlyshowin.patch patches/git_require-gepub-0.5.patch patches/gnome-documents-xdg-fail.patch patches/series

jbicha at users.alioth.debian.org jbicha at users.alioth.debian.org
Wed Sep 13 20:09:43 UTC 2017


Author: jbicha
Date: Wed Sep 13 20:09:43 2017
New Revision: 53851

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53851
Log:
Revert to current 3.22.5-1 packaging

Added:
    desktop/unstable/gnome-documents/debian/patches/git_require-gepub-0.5.patch
      - copied unchanged from r52929, desktop/unstable/gnome-documents/debian/patches/git_require-gepub-0.5.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/90_drop-onlyshowin.patch
    desktop/unstable/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch
    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=53851&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/changelog	[utf-8] Wed Sep 13 20:09:43 2017
@@ -1,15 +1,3 @@
-gnome-documents (3.25.91-1) UNRELEASED; urgency=medium
-
-  * New upstream release
-  * Update build-dependencies according to upstream configure.ac changes:
-    - drop intltool (in favor of gettext)
-    - switch to tracker 2.0
-    - bump required gtk+ and gjs versions
-  * Drop debian/patches/git_require-gepub-0.5.patch, included upstream.
-  * Refresh remaining patches to apply without fuzz.
-
- -- Andreas Henriksson <andreas at fatal.se>  Sat, 02 Sep 2017 19:35:14 +0200
-
 gnome-documents (3.22.5-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=53851&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control	[utf-8] Wed Sep 13 20:09:43 2017
@@ -6,15 +6,16 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>
 Build-Depends: autoconf-archive (>= 20160320),
                debhelper (>= 10),
                desktop-file-utils,
                gnome-pkg-tools (>= 0.10),
+               intltool (>= 0.50.1),
                gir1.2-gepub-0.5,
                gir1.2-gdkpixbuf-2.0,
                gir1.2-pango-1.0,
-               gjs (>= 1.48.0),
+               gjs,
                gobject-introspection (>= 1.31.6),
                gtk-doc-tools,
                inkscape,
@@ -25,10 +26,10 @@
                libglib2.0-dev (>= 2.39.3),
                libgnome-desktop-3-dev (>= 3.10),
                libgoa-1.0-dev (>= 3.10),
-               libgtk-3-dev (>= 3.22.15),
+               libgtk-3-dev (>= 3.19.1),
                libsoup2.4-dev (>= 2.41.3),
-               libtracker-control-2.0-dev,
-               libtracker-sparql-2.0-dev,
+               libtracker-control-1.0-dev (>= 0.17.3),
+               libtracker-sparql-1.0-dev,
                libwebkit2gtk-4.0-dev (>= 2.6.0),
                libzapojit-dev (>= 0.0.2-2),
                poppler-utils,
@@ -48,10 +49,10 @@
          gir1.2-gepub-0.5,
          gir1.2-gdkpixbuf-2.0,
          gir1.2-pango-1.0,
-         gir1.2-tracker-2.0,
+         gir1.2-tracker-1.0,
          gir1.2-webkit2-4.0,
-         tracker (>= 1.99),
-         gjs (>= 1.48.0)
+         tracker (>= 0.17.3),
+         gjs (>= 1.32.0-3)
 Recommends: gnome-user-guide,
             gir1.2-lokdocview-0.1,
             unoconv,

Modified: desktop/unstable/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control.in?rev=53851&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control.in	[utf-8] Wed Sep 13 20:09:43 2017
@@ -7,10 +7,11 @@
                debhelper (>= 10),
                desktop-file-utils,
                gnome-pkg-tools (>= 0.10),
+               intltool (>= 0.50.1),
                gir1.2-gepub-0.5,
                gir1.2-gdkpixbuf-2.0,
                gir1.2-pango-1.0,
-               gjs (>= 1.48.0),
+               gjs,
                gobject-introspection (>= 1.31.6),
                gtk-doc-tools,
                inkscape,
@@ -21,10 +22,10 @@
                libglib2.0-dev (>= 2.39.3),
                libgnome-desktop-3-dev (>= 3.10),
                libgoa-1.0-dev (>= 3.10),
-               libgtk-3-dev (>= 3.22.15),
+               libgtk-3-dev (>= 3.19.1),
                libsoup2.4-dev (>= 2.41.3),
-               libtracker-control-2.0-dev,
-               libtracker-sparql-2.0-dev,
+               libtracker-control-1.0-dev (>= 0.17.3),
+               libtracker-sparql-1.0-dev,
                libwebkit2gtk-4.0-dev (>= 2.6.0),
                libzapojit-dev (>= 0.0.2-2),
                poppler-utils,
@@ -44,10 +45,10 @@
          gir1.2-gepub-0.5,
          gir1.2-gdkpixbuf-2.0,
          gir1.2-pango-1.0,
-         gir1.2-tracker-2.0,
+         gir1.2-tracker-1.0,
          gir1.2-webkit2-4.0,
-         tracker (>= 1.99),
-         gjs (>= 1.48.0)
+         tracker (>= 0.17.3),
+         gjs (>= 1.32.0-3)
 Recommends: gnome-user-guide,
             gir1.2-lokdocview-0.1,
             unoconv,

Modified: desktop/unstable/gnome-documents/debian/patches/90_drop-onlyshowin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/90_drop-onlyshowin.patch?rev=53851&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/90_drop-onlyshowin.patch	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/90_drop-onlyshowin.patch	[utf-8] Wed Sep 13 20:09:43 2017
@@ -2,13 +2,13 @@
 Author: Jeremy Bicha <jbicha at ubuntu.com>
 --- a/data/org.gnome.Books.desktop.in
 +++ b/data/org.gnome.Books.desktop.in
-@@ -7,6 +7,5 @@
+@@ -7,6 +7,5 @@ Terminal=false
  Type=Application
  StartupNotify=true
  DBusActivatable=true
 -OnlyShowIn=GNOME;
  Categories=GNOME;GTK;Utility;Core;
- Keywords=Books;Comics;ePub;PDF;
+ _Keywords=Books;Comics;ePub;PDF;
 --- a/data/org.gnome.Documents.desktop.in
 +++ b/data/org.gnome.Documents.desktop.in
 @@ -7,6 +7,5 @@
@@ -17,4 +17,4 @@
  DBusActivatable=true
 -OnlyShowIn=GNOME;
  Categories=GNOME;GTK;Utility;Core;
- Keywords=Docs;PDF;Document;
+ _Keywords=Docs;PDF;Document;

Modified: desktop/unstable/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch?rev=53851&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch	[utf-8] Wed Sep 13 20:09:43 2017
@@ -12,8 +12,10 @@
 
 This patch catches non-existant XDG User Special dirs and just ignores them.
 
---- a/src/search.js
-+++ b/src/search.js
+Index: gnome-documents-3.21.92/src/search.js
+===================================================================
+--- gnome-documents-3.21.92.orig/src/search.js	2016-09-12 14:41:29.246875441 +0200
++++ gnome-documents-3.21.92/src/search.js	2016-09-12 14:41:29.246875441 +0200
 @@ -369,7 +369,10 @@
  
                  // also ignore XDG locations if they are present with their full path

Modified: desktop/unstable/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/series?rev=53851&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/series	[utf-8] Wed Sep 13 20:09:43 2017
@@ -1,2 +1,3 @@
 90_drop-onlyshowin.patch
 gnome-documents-xdg-fail.patch
+git_require-gepub-0.5.patch




More information about the pkg-gnome-commits mailing list