Merge lp:~noskcaj/ubuntu/vivid/appstream-glib/mir-fixes into lp:ubuntu/vivid/appstream-glib

[Jackson Doak]

Fix various issues preventing the packaged from being MIRed

[lp:~noskcaj/ubuntu/vivid/appstream-glib/mir-fixes]

9. By Jackson Doak on 2015-02-13

add patch header

[Didier Roche (didrocks)]

Looking good and what was needed!

review: Approve

[Didier Roche (didrocks)]

Building fine with the tests, sponsoring!

review: Approve

=== removed file '.pc/applied-patches'
=== modified file 'debian/changelog'
--- debian/changelog	2015-02-03 20:38:42 +0000
+++ debian/changelog	2015-02-13 05:27:44 +0000
@@ -1,3 +1,13 @@
+appstream-glib (0.3.4-1ubuntu1) vivid; urgency=medium
+
+  * Add upstream patch to fix tests
+  * Enable tests
+  * Disable silent rules, allows us to see compile results
+  * Drop unneeded libqt4-dev b-dep
+  * Update d/copyright
+
+ -- Jackson Doak <[e-mail]>  Thu, 12 Feb 2015 19:10:42 +1100
+
 appstream-glib (0.3.4-1) experimental; urgency=medium
 
   * New upstream unstable release: 0.3.4

=== modified file 'debian/control'
--- debian/control	2015-02-03 20:38:42 +0000
+++ debian/control	2015-02-13 05:27:44 +0000
@@ -1,7 +1,8 @@
 Source: appstream-glib
 Section: admin
 Priority: optional
-Maintainer: Matthias Klumpp <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Matthias Klumpp <[e-mail]>
 Build-Depends: debhelper (>= 9.0.0),
                dh-autoreconf (>= 4),
                gtk-doc-tools,
@@ -11,7 +12,6 @@
                libgirepository1.0-dev (>= 1.32),
                libglib2.0-dev (>= 2.40),
                libgtk-3-dev,
-               libqt4-dev,
                libsoup2.4-dev,
                libsqlite3-dev,
                libxml2-dev (>= 2.8.0),

=== modified file 'debian/copyright'
--- debian/copyright	2014-09-23 16:50:18 +0000
+++ debian/copyright	2015-02-13 05:27:44 +0000
@@ -8,6 +8,31 @@
 License: GPL-2+
  LGPL-2.1+
 
+Files: ./libappstream-glib/as-cleanup.h
+Copyright: 2012, Colin Walters <[e-mail]>
+  2014, Richard Hughes <[e-mail]>
+License: LGPL-2.1+
+
+Files: ./libappstream-glib/as-utils.c
+Copyright: 2011 Paolo Bacchilega <[e-mail]>
+  2014, Richard Hughes <[e-mail]>
+License: LGPL-2.1+
+
+Files: ./autogen.sh
+ ./client/as-builder.c
+ ./client/as-util.c
+Copyright: 2014, Richard Hughes <[e-mail]>
+License: GPL-2+
+
+Files: ./libappstream-builder/asb-package-alpm.*
+Copyright: 2014, Fabien Bourigault <[e-mail]>
+License: LGPL-2.1+
+
+Files: ./libappstream-builder/*
+ ./libappstream-glib/*
+Copyright: 2014, Richard Hughes <[e-mail]>
+License: LGPL-2.1+
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -41,19 +66,3 @@
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
-
-Files: ./libappstream-glib/as-cleanup.h
-Copyright: 2012, Colin Walters <[e-mail]>
-  2014, Richard Hughes <[e-mail]>
-License: LGPL-2.1+
-
-Files: ./autogen.sh
- ./client/as-builder.c
- ./client/as-util.c
-Copyright: 2014, Richard Hughes <[e-mail]>
-License: GPL-2+
-
-Files: ./libappstream-builder/*
- ./libappstream-glib/*
-Copyright: 2014, Richard Hughes <[e-mail]>
-License: LGPL-2.1+

=== added directory 'debian/patches'
=== added file 'debian/patches/Fix_as-needed_linking.patch'
--- debian/patches/Fix_as-needed_linking.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/Fix_as-needed_linking.patch	2015-02-13 05:27:44 +0000
@@ -0,0 +1,21 @@
+From 8fea9d934fbfffbead04a1a6ec9e4344725af188 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Wed, 11 Feb 2015 09:11:02 +1100
+Subject: [PATCH] tests: Fix DSO Linking error when built with --as-needed
+
+---
+ libappstream-builder/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libappstream-builder/Makefile.am b/libappstream-builder/Makefile.am
+index 1837487..08318ef 100644
+--- a/libappstream-builder/Makefile.am
++++ b/libappstream-builder/Makefile.am
+@@ -101,6 +101,7 @@ check_PROGRAMS =						\
+ asb_self_test_SOURCES =						\
+ 	asb-self-test.c
+ asb_self_test_LDADD =						\
++	$(AS_GLIB_LIBS)						\
+ 	$(GLIB_LIBS)						\
+ 	$(GDKPIXBUF_LIBS)					\
+ 	$(SOUP_LIBS)						\

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2015-02-13 05:27:44 +0000
@@ -0,0 +1,1 @@
+Fix_as-needed_linking.patch

=== modified file 'debian/rules'
--- debian/rules	2014-09-23 16:50:18 +0000
+++ debian/rules	2015-02-13 05:27:44 +0000
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 #export DH_VERBOSE=1
 
-AS_CONFIGURE_ARGS = --enable-dep11
+AS_CONFIGURE_ARGS = --enable-dep11 --disable-silent-rules
 
 # Define install target dir
 INSTALLDIR = $(CURDIR)/debian/tmp
@@ -30,8 +30,5 @@
 	rm -f  $(INSTALLDIR)/usr/share/gir-1.0/AppStreamBuilder*
 	rm -f  $(INSTALLDIR)/usr/share/man/man1/appstream-builder*
 
-override_dh_auto_test:
-	# Don't run tests, they are always failing at time (20140924)
-
 override_dh_install:
 	dh_install --list-missing