Paste #vXNqGwNn7NtGnZvsqzQA

diff -Nur debian/changelog debian/changelog
…
	1	libxfce4ui (4.13.2-0aegir1) UNRELEASED; urgency=medium
	2
	3	* Merge from Debian UNRELEASED VCS, remaining changes:
	4	- d/control:
	5	+ Update build-dep: libglade2-dev → libgladeui-dev.
	6	+ Add libxfce4ui-glade
	7	- d/rules: Drop --disable-gladeui
	8	* New upstream development release.
	9	- Drop upstream patch.
	10	* d/control:
	11	- Build-depend on libgirepository1.0-dev.
	12	- Add the gir1.2-libxfce4ui-2.0 binary package.
	13	- libxfce4ui-2-dev: Depend on gir1.2-libxfce4ui-2.0.
	14	* d/libxfce4ui-2-dev.install: Install /usr/share/gir-1.0/* too.
	15
	16	-- Unit 193 <unit193@ubuntu.com> Tue, 27 Jun 2017 23:50:53 -0400
	17
1	18	libxfce4ui (4.13.1-2) UNRELEASED; urgency=medium
2	19
3	20	[ Yves-Alexis Perez ]
16	33
17	34	-- Yves-Alexis Perez <corsac@debian.org> Sat, 24 Jun 2017 14:07:35 +0200
18	35
	36	libxfce4ui (4.13.1-1ubuntu1) devel; urgency=medium
	37
	38	* d/control:
	39	- Update build-dep: libglade2-dev → libgladeui-dev.
	40	- Add libxfce4ui-glade
	41	* d/rules: Drop --disable-gladeui
	42
	43	-- Unit 193 <unit193@ubuntu.com> Sun, 05 Feb 2017 00:41:49 -0500
	44
19	45	libxfce4ui (4.13.1-1) experimental; urgency=medium
20	46
21	47	[ Mateusz Łukasik ]
…
1	1	Source: libxfce4ui
2	2	Priority: optional
3	3	Section: xfce
4		Maintainer: ~~Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org~~>
	4	Maintainer: Xubuntu Developers <xubuntu-devel@lists.ubuntu.com>
	5	XSBC-Original-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
5	6	Uploaders: Yves-Alexis Perez <corsac@debian.org>,
6	7	Lionel Le Folgoc <lionel@lefolgoc.net>
7	8	Build-Depends: autotools-dev,
8	9	debhelper (>= 9),
9	10	dpkg-dev (>= 1.16.1),
	11	gobject-introspection,
10	12	intltool (>= 0.31),
	13	libgirepository1.0-dev,
11	14	libgladeui-dev,
12	15	libgtk-3-dev,
13	16	libgtk2.0-dev,
63	66	Section: libdevel
64	67	Architecture: any
65	68	Multi-Arch: same
66		Depends: ~~libgtk-3-dev~~,
	69	Depends: gir1.2-libxfce4ui-2.0 (= ${binary:Version}),
	70	libgtk-3-dev,
67	71	libxfce4ui-2-0 (= ${binary:Version}),
68	72	libxfce4util-dev (>= 4.10.0),
69	73	libxfconf-0-dev (>= 4.10.0),
…
101	105	.
102	106	This package contains the modules for GTK+3 GUI development with Glade.
103	107
	108	Package: gir1.2-libxfce4ui-2.0
	109	Section: introspection
	110	Architecture: any
	111	Multi-Arch: same
	112	Pre-Depends: ${misc:Pre-Depends}
	113	Depends: ${gir:Depends}, ${misc:Depends}
	114	Description: widget library for Xfce - GObject introspection typelib
	115	libxfce4ui is used to share commonly used Xfce widgets among the Xfce
	116	applications.
	117	.
	118	This package provides the introspection data for libxfce4ui.
	119
104	120	Package: libxfce4ui-utils
105	121	Section: xfce
106	122	Architecture: any
4	4	usr/lib/*/libxfce4ui-2.so
5	5	usr/lib/*/pkgconfig/libxfce4kbd-private-3.pc
6	6	usr/lib/*/pkgconfig/libxfce4ui-2.pc
	7	usr/share/gir-1.0/*
1		From bd55a3cee960255aa59a331ee2998c01fdfff8eb Mon Sep 17 00:00:00 2001
2		From: Flo <flo.xfce@gmx-topmail.de>
3		Date: Thu, 15 Sep 2016 10:06:18 +0200
4		Subject: Fix build error with --disable-gtk3 (Bug #12648)
5
6
7		diff --git a/tests/Makefile.am b/tests/Makefile.am
8		index fffeadb..0cd6e55 100644
9		--- a/tests/Makefile.am
10		+++ b/tests/Makefile.am
11		@@ -22,8 +22,7 @@ AM_CPPFLAGS = \
12		-DG_LOG_DOMAIN=\"libxfce4ui-tests\"
13
14		noinst_PROGRAMS = \
15		- test-ui-gtk2 \
16		- test-ui-gtk3
17		+ test-ui-gtk2
18
19
20		# test-ui-gtk2
21		@@ -48,6 +47,10 @@ test_ui_gtk2_LDADD = \
22		$(top_builddir)/libxfce4ui/libxfce4ui-1.la
23
24		# test-ui-gtk3
25		+if ENABLE_GTK3_LIBRARY
26		+noinst_PROGRAMS += \
27		+ test-ui-gtk3
28		+
29		test_ui_gtk3_SOURCES = \
30		test-ui.c
31
32		@@ -67,3 +70,4 @@ test_ui_gtk3_LDADD = \
33		$(LIBSTARTUP_NOTIFICATION_LIBS) \
34		$(LIBXFCE4UTIL_LIBS) \
35		$(top_builddir)/libxfce4ui/libxfce4ui-2.la
36		+endif
37		--
38		cgit v0.10.1
39