Bug#906461: florence: diff for NMU version 0.6.3-1.1

2018-09-16 Thread Adrian Bunk
On Fri, Sep 14, 2018 at 04:48:03PM +0200, Jérémy Bobbio wrote:
> Hi!
> 
> On 14/09/2018 15:51, Adrian Bunk wrote:
> > I've prepared an NMU for florence (versioned as 0.6.3-1.1) and uploaded 
> > it to DELAYED/14. Please feel free to tell me if I should cancel it.
> 
> Thanks!
> 
> Feel free to upload it right away or even take over the package.
> I sadly still haven't found enough time and energy to adjust packages to
> my current (non-)involvement in Debian.

Unfortunately I do not have a personal interest in this package,
I was just fixing some release critical bugs.

But if you want to orphan this package (and other packages?),
I can do the WNPP bug sending so that other people have the
opportunity to adopt.

> Lunar

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed



Bug#906461: florence: diff for NMU version 0.6.3-1.1

2018-09-14 Thread Jérémy Bobbio
Hi!

On 14/09/2018 15:51, Adrian Bunk wrote:
> I've prepared an NMU for florence (versioned as 0.6.3-1.1) and uploaded 
> it to DELAYED/14. Please feel free to tell me if I should cancel it.

Thanks!

Feel free to upload it right away or even take over the package.
I sadly still haven't found enough time and energy to adjust packages to
my current (non-)involvement in Debian.

--
Lunar



signature.asc
Description: OpenPGP digital signature


Bug#906461: florence: diff for NMU version 0.6.3-1.1

2018-09-14 Thread Adrian Bunk
Control: tags 906461 + pending

Dear maintainer,

I've prepared an NMU for florence (versioned as 0.6.3-1.1) and uploaded 
it to DELAYED/14. Please feel free to tell me if I should cancel it.

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed

diff -Nru florence-0.6.3/debian/changelog florence-0.6.3/debian/changelog
--- florence-0.6.3/debian/changelog	2014-11-07 13:24:29.0 +0200
+++ florence-0.6.3/debian/changelog	2018-09-14 16:45:57.0 +0300
@@ -1,3 +1,10 @@
+florence (0.6.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix the Makefile dependencies. (Closes: #906461)
+
+ -- Adrian Bunk   Fri, 14 Sep 2018 16:45:57 +0300
+
 florence (0.6.3-1) unstable; urgency=medium
 
   * New upstream release. (Closes: #764455)
diff -Nru florence-0.6.3/debian/patches/makefile-dependencies.patch florence-0.6.3/debian/patches/makefile-dependencies.patch
--- florence-0.6.3/debian/patches/makefile-dependencies.patch	1970-01-01 02:00:00.0 +0200
+++ florence-0.6.3/debian/patches/makefile-dependencies.patch	2018-08-18 01:25:51.0 +0300
@@ -0,0 +1,15 @@
+Description: Fix the Makefile dependencies
+Author: Adrian Bunk 
+Bug-Debian: https://bugs.debian.org/906461
+
+--- florence-0.6.3.orig/src/Makefile.am
 florence-0.6.3/src/Makefile.am
+@@ -16,7 +16,7 @@ florence_CPPFLAGS = -I$(top_srcdir) -DIC
+-DDATADIR="\"$(datadir)/florence\"" $(DEPS_CFLAGS) $(GTK3_CFLAGS)\
+$(LIBGNOME_CFLAGS) $(LIBNOTIFY_CFLAGS) $(XTST_CFLAGS) $(AT_SPI2_CFLAGS) $(INCLUDES)
+ florence_LDADD = $(DEPS_LIBS) $(LIBM) $(X11_LIBS) $(LIBGNOME_LIBS) $(LIBNOTIFY_LIBS)\
+-   $(XTST_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) -lflorence-1.0
++   $(XTST_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) libflorence-1.0.la
+ 
+ libflorence_1_0_la_SOURCES = lib/florence.c
+ library_includedir=$(includedir)/florence-1.0
diff -Nru florence-0.6.3/debian/patches/series florence-0.6.3/debian/patches/series
--- florence-0.6.3/debian/patches/series	2014-11-07 13:24:23.0 +0200
+++ florence-0.6.3/debian/patches/series	2018-08-18 01:25:22.0 +0300
@@ -1,2 +1,3 @@
 0001-Add-nonet-option-to-xmllint-and-xsltproc-calls.patch
 0002-Add-missing-links-on-libflorence.patch
+makefile-dependencies.patch