On Wed, 30 Jul 2014 at 16:10:25 +0800, YunQiang Su wrote:
> I think this problem is caused by libgtk-3-dev.
> File /usr/share/aclocal/gtk-3.0.m4, it doesn't work,
> as the header files of gtk+3 is in /usr/include/gtk-3.0
>
> And I will nmu spotlighter to not use gtk-3.0.m4.
Whenever you NMU a package, you should send the diff between the
current package and your proposed NMU to the BTS. (See ยง5.11.1 in
<https://www.debian.org/doc/manuals/developers-reference/pkgs.html#nmu>.)
I attach the diff between 0.3-1 and 0.3-1.1.
A much simpler Gtk version check, suitable for sending upstream:
- delete the call to AM_PATH_GTK_3_0 as was done in the NMU
- delete this block:
AC_MSG_CHECKING([if GTK+ is version 2.99.3 or newer])
...
AC_MSG_RESULT($have_gtk_3)
- delete the unused pkg_modules variable
- change PKG_CHECK_MODULES(spotlighter, [gtk+-3.0])
to PKG_CHECK_MODULES([spotlighter], [gtk+-3.0 >=] gtk_required_version)
S
diffstat for spotlighter-0.3 spotlighter-0.3
changelog | 8 ++++++++
control | 3 ++-
patches/no_AM_PATH_GTK_3_0.diff | 16 ++++++++++++++++
patches/series | 1 +
rules | 2 +-
5 files changed, 28 insertions(+), 2 deletions(-)
diff -Nru spotlighter-0.3/debian/changelog spotlighter-0.3/debian/changelog
--- spotlighter-0.3/debian/changelog 2013-12-14 09:41:29.000000000 +0000
+++ spotlighter-0.3/debian/changelog 2014-07-30 09:48:24.000000000 +0100
@@ -1,3 +1,11 @@
+spotlighter (0.3-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * don't use AM_PATH_GTK_3_0 in configure.ac, as it cannot work
+ * use dh-autoreconf update build system (Closes: #747804 #727974)
+
+ -- YunQiang Su <s...@debian.org> Wed, 30 Jul 2014 16:26:02 +0800
+
spotlighter (0.3-1) unstable; urgency=low
* New upstream release. (Closes: #685911)
diff -Nru spotlighter-0.3/debian/control spotlighter-0.3/debian/control
--- spotlighter-0.3/debian/control 2013-12-14 09:35:10.000000000 +0000
+++ spotlighter-0.3/debian/control 2014-07-30 09:29:19.000000000 +0100
@@ -6,7 +6,8 @@
autotools-dev,
intltool,
pkg-config,
- libgtk-3-dev
+ libgtk-3-dev,
+ dh-autoreconf
Standards-Version: 3.9.5
Homepage: http://code.google.com/p/ardesia/
Vcs-Git: git://anonscm.debian.org/collab-maint/spotlighter.git
diff -Nru spotlighter-0.3/debian/patches/no_AM_PATH_GTK_3_0.diff spotlighter-0.3/debian/patches/no_AM_PATH_GTK_3_0.diff
--- spotlighter-0.3/debian/patches/no_AM_PATH_GTK_3_0.diff 1970-01-01 01:00:00.000000000 +0100
+++ spotlighter-0.3/debian/patches/no_AM_PATH_GTK_3_0.diff 2014-07-30 09:28:48.000000000 +0100
@@ -0,0 +1,16 @@
+Index: spotlighter-0.3/configure.ac
+===================================================================
+--- spotlighter-0.3.orig/configure.ac 2012-09-04 18:38:43.000000000 +0800
++++ spotlighter-0.3/configure.ac 2014-07-30 16:28:44.745410082 +0800
+@@ -73,11 +73,6 @@
+ #######
+ # Gtk 3
+ #######
+-AM_PATH_GTK_3_0(gtk_required_version, :,
+- AC_MSG_ERROR(Test for GTK3+ failed. See the file 'INSTALL' for help.),
+- gthread)
+-
+-
+ AC_MSG_CHECKING([if GTK+ is version 2.99.3 or newer])
+ if $PKG_CONFIG --atleast-version=2.99.3 gtk+-3.0; then
+ have_gtk3=yes
diff -Nru spotlighter-0.3/debian/patches/series spotlighter-0.3/debian/patches/series
--- spotlighter-0.3/debian/patches/series 2013-12-13 17:40:23.000000000 +0000
+++ spotlighter-0.3/debian/patches/series 2014-07-30 09:28:28.000000000 +0100
@@ -1,2 +1,3 @@
00_desktop.patch
01_ftbfs_mips.patch
+no_AM_PATH_GTK_3_0.diff
diff -Nru spotlighter-0.3/debian/rules spotlighter-0.3/debian/rules
--- spotlighter-0.3/debian/rules 2013-12-13 12:18:42.000000000 +0000
+++ spotlighter-0.3/debian/rules 2014-07-30 09:29:02.000000000 +0100
@@ -2,4 +2,4 @@
#export DH_VERBOSE=1
%:
- dh $@ --with autotools_dev
+ dh $@ --with autoreconf
