r43069 - in /packages/unstable/gnome-logs/debian: changelog control control.in patches/ patches/revert-appstream-usage.patch patches/series

ah at users.alioth.debian.org ah at users.alioth.debian.org
Tue Sep 23 18:06:26 UTC 2014 

Author: ah
Date: Tue Sep 23 18:06:26 2014
New Revision: 43069

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43069
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
  - bump gtk+ to >= 3.13.4
* Add debian/patches/revert-appstream-usage.patch
  - we don't have appstream-glib in Debian yet... see #752900

Added:
    packages/unstable/gnome-logs/debian/patches/
    packages/unstable/gnome-logs/debian/patches/revert-appstream-usage.patch
    packages/unstable/gnome-logs/debian/patches/series
Modified:
    packages/unstable/gnome-logs/debian/changelog
    packages/unstable/gnome-logs/debian/control
    packages/unstable/gnome-logs/debian/control.in

Modified: packages/unstable/gnome-logs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-logs/debian/changelog?rev=43069&op=diff
==============================================================================
--- packages/unstable/gnome-logs/debian/changelog	[utf-8] (original)
+++ packages/unstable/gnome-logs/debian/changelog	[utf-8] Tue Sep 23 18:06:26 2014
@@ -1,3 +1,13 @@
+gnome-logs (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - bump gtk+ to >= 3.13.4
+  * Add debian/patches/revert-appstream-usage.patch
+    - we don't have appstream-glib in Debian yet... see #752900
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 23 Sep 2014 20:05:17 +0200
+
 gnome-logs (3.12.2-2) unstable; urgency=medium
 
   * Add CC0 license notice in debian/copyright for appdata xml file.

Modified: packages/unstable/gnome-logs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-logs/debian/control?rev=43069&op=diff
==============================================================================
--- packages/unstable/gnome-logs/debian/control	[utf-8] (original)
+++ packages/unstable/gnome-logs/debian/control	[utf-8] Tue Sep 23 18:06:26 2014
@@ -2,7 +2,6 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
-
 Source: gnome-logs
 Section: gnome
 Priority: optional
@@ -10,7 +9,7 @@
 Uploaders: Andreas Henriksson <andreas at fatal.se>
 Build-Depends: debhelper (>= 9.0.0), autotools-dev, libsystemd-journal-dev,
   libglib2.0-dev (>= 2.39.90),
-  libgtk-3-dev (>= 3.9.6),
+  libgtk-3-dev (>= 3.13.4),
   gnome-pkg-tools,
   intltool (>= 0.50.0),
   yelp-tools,
@@ -22,7 +21,7 @@
 
 Package: gnome-logs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, gsettings-desktop-schemas
 Description: viewer for the systemd journal.
  The GNOME Logs application is an application to view system logs
  (from the systemd journal) for the GNOME Desktop environment.

Modified: packages/unstable/gnome-logs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-logs/debian/control.in?rev=43069&op=diff
==============================================================================
--- packages/unstable/gnome-logs/debian/control.in	[utf-8] (original)
+++ packages/unstable/gnome-logs/debian/control.in	[utf-8] Tue Sep 23 18:06:26 2014
@@ -5,7 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9.0.0), autotools-dev, libsystemd-journal-dev,
   libglib2.0-dev (>= 2.39.90),
-  libgtk-3-dev (>= 3.9.6),
+  libgtk-3-dev (>= 3.13.4),
   gnome-pkg-tools,
   intltool (>= 0.50.0),
   yelp-tools,

Added: packages/unstable/gnome-logs/debian/patches/revert-appstream-usage.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-logs/debian/patches/revert-appstream-usage.patch?rev=43069&op=file
==============================================================================
--- packages/unstable/gnome-logs/debian/patches/revert-appstream-usage.patch	(added)
+++ packages/unstable/gnome-logs/debian/patches/revert-appstream-usage.patch	[utf-8] Tue Sep 23 18:06:26 2014
@@ -0,0 +1,64 @@
+From: Andreas Henriksson <andreas at fatal.se>
+Subject: revert appstream-glib usage
+
+This reverts upstream commit
+"Use APPSTREAM_XML instead of APPDATA_XML"
+
+We don't have appstream-glib available in Debian yet....
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+-	--enable-appstream-util \
++	--enable-appdata-validate \
+ 	--enable-tests
+ 
+ SUBDIRS = help po
+@@ -68,11 +68,11 @@ nodist_gnome_logs_headers = \
+ 	$(AM_V_at)$(MKDIR_P) $(@D)
+ 	$(AM_V_at)touch $@
+ 
+- at APPSTREAM_XML_RULES@
++ at APPDATA_XML_RULES@
+ @INTLTOOL_XML_RULE@
+-appstream_in_files = data/org.gnome.Logs.appdata.xml.in
+-$(appstream_in_files:.appdata.xml.in=.appdata.xml): data/.dstamp
+-appstream_XML = $(appstream_in_files:.appdata.xml.in=.appdata.xml)
++appdata_in_files = data/org.gnome.Logs.appdata.xml.in
++$(appdata_in_files:.appdata.xml.in=.appdata.xml): data/.dstamp
++appdata_XML = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ desktopdir = $(datadir)/applications
+@@ -170,7 +170,7 @@ src/gl-resource.c src/gl-resource.h: data/org.gnome.Logs.gresource.xml Makefile
+ dist_noinst_DATA = \
+ 	$(noinst_gnome_logs_headers) \
+ 	$(noinst_resource_files) \
+-	$(appstream_in_files) \
++	$(appdata_in_files) \
+ 	$(desktop_in_files) \
+ 	data/org.gnome.Logs.gresource.xml \
+ 	data/gnome-logs.xml \
+@@ -194,7 +194,7 @@ git-changelog-hook:
+ 	else rm -f .ChangeLog.tmp; exit 1; fi
+ 
+ CLEANFILES = \
+-	$(appstream_XML) \
++	$(appdata_XML) \
+ 	$(desktop_DATA) \
+ 	$(enum_data) \
+ 	$(nodist_man_MANS) \
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,7 +62,7 @@ AS_IF([test "x$enable_man" != "xno"],
+ AM_CONDITIONAL([ENABLE_MAN], [test "x$have_manutils" = "xyes"])
+ 
+ dnl AppData XML
+-APPSTREAM_XML
++APPDATA_XML
+ 
+ dnl Mallard Help
+ YELP_HELP_INIT

Added: packages/unstable/gnome-logs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-logs/debian/patches/series?rev=43069&op=file
==============================================================================
--- packages/unstable/gnome-logs/debian/patches/series	(added)
+++ packages/unstable/gnome-logs/debian/patches/series	[utf-8] Tue Sep 23 18:06:26 2014
@@ -0,0 +1 @@
+revert-appstream-usage.patch

More information about the pkg-gnome-commits mailing list