r53850 - in /desktop/experimental/gnome-documents/debian: changelog control control.in gnome-books.install gnome-documents.install libgd-common.install libgd.install patches/90_drop-onlyshowin.patch patches/gnome-documents-xdg-fail.patch rules
jbicha at users.alioth.debian.org
jbicha at users.alioth.debian.org
Wed Sep 13 20:03:55 UTC 2017
Author: jbicha
Date: Wed Sep 13 20:03:53 2017
New Revision: 53850
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53850
Log:
Move 3.26 WIP packaging from unstable since it needs new gjs
Removed:
desktop/experimental/gnome-documents/debian/gnome-books.install
desktop/experimental/gnome-documents/debian/gnome-documents.install
desktop/experimental/gnome-documents/debian/libgd-common.install
desktop/experimental/gnome-documents/debian/libgd.install
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/90_drop-onlyshowin.patch
desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch
desktop/experimental/gnome-documents/debian/rules
Modified: desktop/experimental/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/changelog?rev=53850&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/changelog [utf-8] Wed Sep 13 20:03:53 2017
@@ -1,12 +1,27 @@
-gnome-documents (3.24.1-1) UNRELEASED; urgency=medium
-
- * New upstream release.
- * Split gnome-books into a separate package so that it can be installed
- or uninstalled separately by appstream clients.
+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.
* Update 90_drop-onlyshowin.patch to show Books app
in any desktop (LP: #1687101)
-
- -- Jeremy Bicha <jbicha at ubuntu.com> Fri, 28 Apr 2017 16:36:09 -0400
+ * Add git_require-gepub-0.5.patch:
+ - Cherry-pick commit for compatibility with libgepub 0.5
+ * debian/control.in:
+ - Depend and Build-Depend on gir1.2-gepub-0.5
+ * Bump Standards-Version to 4.1.0
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Tue, 29 Aug 2017 08:43:45 -0400
gnome-documents (3.22.2-1) unstable; urgency=medium
Modified: desktop/experimental/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/control?rev=53850&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/control [utf-8] Wed Sep 13 20:03:53 2017
@@ -11,11 +11,10 @@
debhelper (>= 10),
desktop-file-utils,
gnome-pkg-tools (>= 0.10),
- intltool (>= 0.50.1),
- gir1.2-gepub-0.4,
+ gir1.2-gepub-0.5,
gir1.2-gdkpixbuf-2.0,
gir1.2-pango-1.0,
- gjs,
+ gjs (>= 1.48.0),
gobject-introspection (>= 1.31.6),
gtk-doc-tools,
inkscape,
@@ -26,98 +25,38 @@
libglib2.0-dev (>= 2.39.3),
libgnome-desktop-3-dev (>= 3.10),
libgoa-1.0-dev (>= 3.10),
- libgtk-3-dev (>= 3.19.1),
+ libgtk-3-dev (>= 3.22.15),
libsoup2.4-dev (>= 2.41.3),
- libtracker-control-1.0-dev (>= 0.17.3),
- libtracker-sparql-1.0-dev,
+ libtracker-control-2.0-dev,
+ libtracker-sparql-2.0-dev,
libwebkit2gtk-4.0-dev (>= 2.6.0),
libzapojit-dev (>= 0.0.2-2),
poppler-utils,
yelp-tools,
xsltproc
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
Homepage: https://wiki.gnome.org/Apps/Documents
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-documents
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-documents/
-
-Package: gnome-books
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libgd (= ${source:Version}),
- libgd-common (= ${source:Version}),
- gnome-online-miners,
- gir1.2-gepub-0.4,
- gir1.2-gdkpixbuf-2.0,
- gir1.2-pango-1.0,
- gir1.2-tracker-1.0,
- gir1.2-webkit2-4.0,
- tracker (>= 0.17.3),
- gjs (>= 1.32.0-3)
-Recommends: gir1.2-lokdocview-0.1,
- unoconv,
- libgsf-bin,
-Breaks: gnome-documents (<< 3.24.1-1~)
-Replaces: gnome-documents (<< 3.24.1-1~)
-Conflicts: libreoffice-gtk3 (<= 1:5.1.1-1)
-Description: E-book reader for GNOME
- GNOME Books is a simple application to access and organize your e-books
- on GNOME. It is meant to be a simple and elegant replacement for using a
- file manager to deal with e-books.
- .
- GNOME Books supports epub, DjVu and comic book files.
Package: gnome-documents
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libgd (= ${source:Version}),
- libgd-common (= ${source:Version}),
+ ${gir:Depends},
gnome-online-miners,
- gir1.2-gepub-0.4,
+ gir1.2-gepub-0.5,
gir1.2-gdkpixbuf-2.0,
gir1.2-pango-1.0,
- gir1.2-tracker-1.0,
+ gir1.2-tracker-2.0,
gir1.2-webkit2-4.0,
- tracker (>= 0.17.3),
- gjs (>= 1.32.0-3)
+ tracker (>= 1.99),
+ gjs (>= 1.48.0)
Recommends: gnome-user-guide,
gir1.2-lokdocview-0.1,
unoconv,
libgsf-bin
Conflicts: libreoffice-gtk3 (<= 1:5.1.1-1)
Description: Document manager for GNOME
- GNOME Documents is a simple application to access, organize and share your
- documents on GNOME. It is meant to be a simple and elegant replacement for
- using a file manager to deal with documents. Seamless cloud integration is
- offered through GNOME Online Accounts.
-
-Package: libgd
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
-Breaks: gnome-documents (<< 3.24.1-1~)
-Replaces: gnome-documents (<< 3.24.1-1~)
-Description: Shared library for the GNOME Books and Documents apps
- GNOME Documents is a simple application to access, organize and share your
- documents on GNOME. It is meant to be a simple and elegant replacement for
- using a file manager to deal with documents. Seamless cloud integration is
- offered through GNOME Online Accounts.
- .
- libgd is a library used by the GNOME Documents and Books apps
-
-Package: libgd-common
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${gir:Depends},
-Recommends: yelp
-Breaks: gnome-documents (<< 3.24.1-1~)
-Replaces: gnome-documents (<< 3.24.1-1~)
-Description: Shared files for the GNOME Books and Documents apps
- GNOME Documents is a simple application to access, organize and share your
- documents on GNOME. It is meant to be a simple and elegant replacement for
- using a file manager to deal with documents. Seamless cloud integration is
- offered through GNOME Online Accounts.
- .
- This package contains the common files, such as translations and help.
+ GNOME Documents is a standalone application to find, organize and view
+ your 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=53850&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/control.in [utf-8] Wed Sep 13 20:03:53 2017
@@ -7,11 +7,10 @@
debhelper (>= 10),
desktop-file-utils,
gnome-pkg-tools (>= 0.10),
- intltool (>= 0.50.1),
- gir1.2-gepub-0.4,
+ gir1.2-gepub-0.5,
gir1.2-gdkpixbuf-2.0,
gir1.2-pango-1.0,
- gjs,
+ gjs (>= 1.48.0),
gobject-introspection (>= 1.31.6),
gtk-doc-tools,
inkscape,
@@ -22,98 +21,38 @@
libglib2.0-dev (>= 2.39.3),
libgnome-desktop-3-dev (>= 3.10),
libgoa-1.0-dev (>= 3.10),
- libgtk-3-dev (>= 3.19.1),
+ libgtk-3-dev (>= 3.22.15),
libsoup2.4-dev (>= 2.41.3),
- libtracker-control-1.0-dev (>= 0.17.3),
- libtracker-sparql-1.0-dev,
+ libtracker-control-2.0-dev,
+ libtracker-sparql-2.0-dev,
libwebkit2gtk-4.0-dev (>= 2.6.0),
libzapojit-dev (>= 0.0.2-2),
poppler-utils,
yelp-tools,
xsltproc
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
Homepage: https://wiki.gnome.org/Apps/Documents
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-documents
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-documents/
-
-Package: gnome-books
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- libgd (= ${source:Version}),
- libgd-common (= ${source:Version}),
- gnome-online-miners,
- gir1.2-gepub-0.4,
- gir1.2-gdkpixbuf-2.0,
- gir1.2-pango-1.0,
- gir1.2-tracker-1.0,
- gir1.2-webkit2-4.0,
- tracker (>= 0.17.3),
- gjs (>= 1.32.0-3)
-Recommends: gir1.2-lokdocview-0.1,
- unoconv,
- libgsf-bin,
-Breaks: gnome-documents (<< 3.24.1-1~)
-Replaces: gnome-documents (<< 3.24.1-1~)
-Conflicts: libreoffice-gtk3 (<= 1:5.1.1-1)
-Description: E-book reader for GNOME
- GNOME Books is a simple application to access and organize your e-books
- on GNOME. It is meant to be a simple and elegant replacement for using a
- file manager to deal with e-books.
- .
- GNOME Books supports epub, DjVu and comic book files.
Package: gnome-documents
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libgd (= ${source:Version}),
- libgd-common (= ${source:Version}),
+ ${gir:Depends},
gnome-online-miners,
- gir1.2-gepub-0.4,
+ gir1.2-gepub-0.5,
gir1.2-gdkpixbuf-2.0,
gir1.2-pango-1.0,
- gir1.2-tracker-1.0,
+ gir1.2-tracker-2.0,
gir1.2-webkit2-4.0,
- tracker (>= 0.17.3),
- gjs (>= 1.32.0-3)
+ tracker (>= 1.99),
+ gjs (>= 1.48.0)
Recommends: gnome-user-guide,
gir1.2-lokdocview-0.1,
unoconv,
libgsf-bin
Conflicts: libreoffice-gtk3 (<= 1:5.1.1-1)
Description: Document manager for GNOME
- GNOME Documents is a simple application to access, organize and share your
- documents on GNOME. It is meant to be a simple and elegant replacement for
- using a file manager to deal with documents. Seamless cloud integration is
- offered through GNOME Online Accounts.
-
-Package: libgd
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends},
-Breaks: gnome-documents (<< 3.24.1-1~)
-Replaces: gnome-documents (<< 3.24.1-1~)
-Description: Shared library for the GNOME Books and Documents apps
- GNOME Documents is a simple application to access, organize and share your
- documents on GNOME. It is meant to be a simple and elegant replacement for
- using a file manager to deal with documents. Seamless cloud integration is
- offered through GNOME Online Accounts.
- .
- libgd is a library used by the GNOME Documents and Books apps.
-
-Package: libgd-common
-Architecture: all
-Depends: ${shlibs:Depends},
- ${misc:Depends},
- ${gir:Depends},
-Recommends: yelp
-Breaks: gnome-documents (<< 3.24.1-1~)
-Replaces: gnome-documents (<< 3.24.1-1~)
-Description: Shared files for the GNOME Books and Documents apps
- GNOME Documents is a simple application to access, organize and share your
- documents on GNOME. It is meant to be a simple and elegant replacement for
- using a file manager to deal with documents. Seamless cloud integration is
- offered through GNOME Online Accounts.
- .
- This package contains the common files, such as translations and help.
+ GNOME Documents is a standalone application to find, organize and view
+ your documents.
Modified: desktop/experimental/gnome-documents/debian/patches/90_drop-onlyshowin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/patches/90_drop-onlyshowin.patch?rev=53850&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/patches/90_drop-onlyshowin.patch [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/patches/90_drop-onlyshowin.patch [utf-8] Wed Sep 13 20:03:53 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 @@ Terminal=false
+@@ -7,6 +7,5 @@
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/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch?rev=53850&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/patches/gnome-documents-xdg-fail.patch [utf-8] Wed Sep 13 20:03:53 2017
@@ -12,10 +12,8 @@
This patch catches non-existant XDG User Special dirs and just ignores them.
-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
+--- a/src/search.js
++++ b/src/search.js
@@ -369,7 +369,10 @@
// also ignore XDG locations if they are present with their full path
Modified: desktop/experimental/gnome-documents/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-documents/debian/rules?rev=53850&op=diff
==============================================================================
--- desktop/experimental/gnome-documents/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-documents/debian/rules [utf-8] Wed Sep 13 20:03:53 2017
@@ -13,15 +13,15 @@
dh_auto_configure -- \
--enable-getting-started
-override_dh_install:
- find debian/ -name '*.la' -delete
- dh_install --fail-missing
+override_dh_auto_install:
+ dh_auto_install
+ find debian/gnome-documents -name '*.la' -delete
override_dh_makeshlibs:
dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-documents
override_dh_girepository:
dh_girepository -X/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-documents \
- -ldebian/libgd-common/usr/share/gnome-documents/gir-1.0 \
+ -ldebian/gnome-documents/usr/share/gnome-documents/gir-1.0 \
/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-documents/ /usr/lib/$(DEB_HOST_MULTIARCH)/gnome-documents/girepository-1.0/
More information about the pkg-gnome-commits
mailing list