r44453 - in /desktop/unstable/gnome-terminal/debian: changelog control control.in patches/git_remove_appdata_validation.patch patches/series

[ah at users.alioth.debian.org]

Author: ah
Date: Tue May 19 14:42:13 2015
New Revision: 44453

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44453
Log:
* Add patch from upstream 3.16 branch for now
  - ‘debian/patches/git_remove_appdata_validation.patch’
* Drop appdata-tools build-dependency

Added:
    desktop/unstable/gnome-terminal/debian/patches/git_remove_appdata_validation.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control
    desktop/unstable/gnome-terminal/debian/control.in
    desktop/unstable/gnome-terminal/debian/patches/series

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=44453&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Tue May 19 14:42:13 2015
@@ -1,8 +1,14 @@
-gnome-terminal (3.14.2-1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-
- -- Pedro Beja <althaser at gmail.com>  Wed, 26 Nov 2014 14:59:47 +0000
+gnome-terminal (3.14.2-1) unstable; urgency=medium
+
+  [ Pedro Beja ]
+  * New upstream release.
+
+  [ Andreas Henriksson ]
+  * Add patch from upstream 3.16 branch for now
+    - ‘debian/patches/git_remove_appdata_validation.patch’
+  * Drop appdata-tools build-dependency
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 19 May 2015 16:35:34 +0200
 
 gnome-terminal (3.14.1-1) unstable; urgency=medium
 

Modified: desktop/unstable/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control?rev=44453&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control	[utf-8] Tue May 19 14:42:13 2015
@@ -28,7 +28,6 @@
                yelp-tools,
                libgconf2-dev (>= 2.31.3),
                desktop-file-utils,
-               appdata-tools,
                gsettings-desktop-schemas-dev (>= 0.1.0),
                gnome-shell [linux-any],
                libnautilus-extension-dev

Modified: desktop/unstable/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control.in?rev=44453&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control.in	[utf-8] Tue May 19 14:42:13 2015
@@ -24,7 +24,6 @@
                yelp-tools,
                libgconf2-dev (>= 2.31.3),
                desktop-file-utils,
-               appdata-tools,
                gsettings-desktop-schemas-dev (>= 0.1.0),
                gnome-shell [linux-any],
                libnautilus-extension-dev

Added: desktop/unstable/gnome-terminal/debian/patches/git_remove_appdata_validation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/git_remove_appdata_validation.patch?rev=44453&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/git_remove_appdata_validation.patch	(added)
+++ desktop/unstable/gnome-terminal/debian/patches/git_remove_appdata_validation.patch	[utf-8] Tue May 19 14:42:13 2015
@@ -0,0 +1,44 @@
+From afb451c0ae7db135d5e2544d7e2187da60cfd711 Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe at gnome.org>
+Date: Tue, 10 Feb 2015 19:47:28 +0100
+Subject: build: Remove appdata validation
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739410
+
+diff --git a/Makefile.am b/Makefile.am
+index eccf5ce..f6f41a6 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -29,12 +29,6 @@ appdata_in_files = gnome-terminal.appdata.xml.in
+ nodist_appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+ 
+-APPDATA_VALIDATE_FLAGS = --nonet
+-appdata-validate: $(nodist_appdata_DATA)
+-	for f in $^; do \
+-		$(APPDATA_VALIDATE) $(APPDATA_VALIDATE_FLAGS) $$f; \
+-	done
+-
+ check-local: desktop-file-validate
+ 
+ EXTRA_DIST = 			\
+diff --git a/configure.ac b/configure.ac
+index 75fd6da..5180ec6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -189,12 +189,6 @@ if test -z "$DESKTOP_FILE_VALIDATE"; then
+   AC_MSG_ERROR([desktop-file-validate not found])
+ fi
+ 
+-AC_ARG_VAR([APPDATA_VALIDATE],[the appdata-validate programme])
+-AC_PATH_PROG([APPDATA_VALIDATE],[appdata-validate],[])
+-if test -z "$APPDATA_VALIDATE"; then
+-  AC_MSG_ERROR([appdata-validate not found])
+-fi
+-
+ # ***************************
+ # GNOME Shell search provider
+ # ***************************
+-- 
+cgit v0.10.2
+

Modified: desktop/unstable/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/series?rev=44453&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] Tue May 19 14:42:13 2015
@@ -2,3 +2,4 @@
 01_onlyshowin.patch
 10_kfreebsd-f_dupfd_cloexec.patch
 Don-t-allow-the-theme-to-set-black-on-black.patch
+git_remove_appdata_validation.patch