Bug#947653: csv2latex FTCBFS: strips with the wrong strip

2020-01-03 Thread Benoît Rouits
Ok, thank you Helmut.

As I am also the upstream dev of csv2latex. After reflection, I
eventually found 'strip' being useless now. So, instead of making a
patch in the debian/patches, I released csv2latex-0.22 (upstream) with
Makefile fixed (no strip at all), so that it is simpler for everyone.

I just uploaded the Debian source package on :
https://mentors.debian.net/package/csv2latex

Hopefully, I know a mentor that will almost certainly upload the package
in unstable in a few hours or days.

Thank you again for your bug report!
I let you close bug #947653 when you want (reason: fixed upstream)...
 Benoît

Le 02/01/2020 à 20:08, Helmut Grohne a écrit :
> Hi Benoît,
> 
> On Sun, Dec 29, 2019 at 05:57:51PM +0100, Benoît Rouits wrote:
>> Unfortunately, i cannot sign the new source package due to your
>> changelog entry. What is the best way to integrate your patch then ?
>> May i change the debian changelog entry with my own message or is there
>> a better way to integrate your patch (maybe you should sign the source
>> package) ?
> 
> Of course you should change the changelog entry. It is still unreleased.
> You can use "dch -r" to update the release. Doing so will also change
> the final email address to yours. Alternatively, you can edit the text
> yourself or only apply the non-changelog portion of my patch and
> manually add your changelog. Whatever fits your workflow.
> 
> Helmut
> 



signature.asc
Description: OpenPGP digital signature


Bug#947653: csv2latex FTCBFS: strips with the wrong strip

2020-01-02 Thread Helmut Grohne
Hi Benoît,

On Sun, Dec 29, 2019 at 05:57:51PM +0100, Benoît Rouits wrote:
> Unfortunately, i cannot sign the new source package due to your
> changelog entry. What is the best way to integrate your patch then ?
> May i change the debian changelog entry with my own message or is there
> a better way to integrate your patch (maybe you should sign the source
> package) ?

Of course you should change the changelog entry. It is still unreleased.
You can use "dch -r" to update the release. Doing so will also change
the final email address to yours. Alternatively, you can edit the text
yourself or only apply the non-changelog portion of my patch and
manually add your changelog. Whatever fits your workflow.

Helmut



Bug#947653: csv2latex FTCBFS: strips with the wrong strip

2019-12-29 Thread Benoît Rouits
Hello again Helmut,

Unfortunately, i cannot sign the new source package due to your
changelog entry. What is the best way to integrate your patch then ?
May i change the debian changelog entry with my own message or is there
a better way to integrate your patch (maybe you should sign the source
package) ?

Thank you for your reply.
 Benoît

Le 29/12/2019 à 17:45, Benoît Rouits a écrit :
> Thank you Helmut for your patch.
> I am applying it. Then i will ask my deb mentor to upload the new source
> package i will build with your patch included.
>  Benoît
> 
> Le 28/12/2019 à 21:52, Helmut Grohne a écrit :
>> Source: csv2latex
>> Version: 0.21-1
>> Tags: patch
>> User: debian-cr...@lists.debian.org
>> Usertags: ftcbfs
>>
>> csv2latex fails to cross build from source, because it strips with the
>> wrong strip at make install time. Beyond breaking cross compilation,
>> this breaks DEB_BUILD_OPTION=nostrip as well as generation of -dbgsym
>> packages. It is best to defer all stripping to dh_strip. The attached
>> patch implements that. Please consider applying it.
>>
>> Helmut
>>



Bug#947653: csv2latex FTCBFS: strips with the wrong strip

2019-12-29 Thread Benoît Rouits
Thank you Helmut for your patch.
I am applying it. Then i will ask my deb mentor to upload the new source
package i will build with your patch included.
 Benoît

Le 28/12/2019 à 21:52, Helmut Grohne a écrit :
> Source: csv2latex
> Version: 0.21-1
> Tags: patch
> User: debian-cr...@lists.debian.org
> Usertags: ftcbfs
> 
> csv2latex fails to cross build from source, because it strips with the
> wrong strip at make install time. Beyond breaking cross compilation,
> this breaks DEB_BUILD_OPTION=nostrip as well as generation of -dbgsym
> packages. It is best to defer all stripping to dh_strip. The attached
> patch implements that. Please consider applying it.
> 
> Helmut
> 



Bug#947653: csv2latex FTCBFS: strips with the wrong strip

2019-12-28 Thread Helmut Grohne
Source: csv2latex
Version: 0.21-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs

csv2latex fails to cross build from source, because it strips with the
wrong strip at make install time. Beyond breaking cross compilation,
this breaks DEB_BUILD_OPTION=nostrip as well as generation of -dbgsym
packages. It is best to defer all stripping to dh_strip. The attached
patch implements that. Please consider applying it.

Helmut
diff --minimal -Nru csv2latex-0.21/debian/changelog 
csv2latex-0.21/debian/changelog
--- csv2latex-0.21/debian/changelog 2018-07-02 23:52:26.0 +0200
+++ csv2latex-0.21/debian/changelog 2019-12-28 21:47:36.0 +0100
@@ -1,3 +1,12 @@
+csv2latex (0.21-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS and DEB_BUILD_OPTIONS=nostrip and -dbgsym: (Closes: #-1)
++ nostrip.patch: Make stripping optional.
++ Defer all stripping to dh_strip.
+
+ -- Helmut Grohne   Sat, 28 Dec 2019 21:47:36 +0100
+
 csv2latex (0.21-1) unstable; urgency=medium
 
   * new upstream version 0.21 (options --font and --landscape)
diff --minimal -Nru csv2latex-0.21/debian/patches/nostrip.patch 
csv2latex-0.21/debian/patches/nostrip.patch
--- csv2latex-0.21/debian/patches/nostrip.patch 1970-01-01 01:00:00.0 
+0100
+++ csv2latex-0.21/debian/patches/nostrip.patch 2019-12-28 21:47:14.0 
+0100
@@ -0,0 +1,16 @@
+--- csv2latex-0.21.orig/Makefile
 csv2latex-0.21/Makefile
+@@ -4,11 +4,12 @@
+ MANDIR=$(PREFIX)/share/man/man1
+ CFLAGS=-Wall -Wextra -pedantic -Os
+ GZIP=gzip --to-stdout
++STRIP?=strip
+ all:
+   $(CC) $(CPPFLAGS) $(CFLAGS) $(PROGNAME).c $(LDFLAGS) -o $(PROGNAME)
+   $(GZIP) $(PROGNAME).1 > $(PROGNAME).1.gz
+ install:
+-  strip $(PROGNAME)
++  $(STRIP) $(PROGNAME)
+   install $(PROGNAME) ${DESTDIR}$(BINDIR)/$(PROGNAME)
+   install -D $(PROGNAME).1.gz ${DESTDIR}$(MANDIR)/$(PROGNAME).1.gz
+ uninstall:
diff --minimal -Nru csv2latex-0.21/debian/patches/series 
csv2latex-0.21/debian/patches/series
--- csv2latex-0.21/debian/patches/series1970-01-01 01:00:00.0 
+0100
+++ csv2latex-0.21/debian/patches/series2019-12-28 21:46:27.0 
+0100
@@ -0,0 +1 @@
+nostrip.patch
diff --minimal -Nru csv2latex-0.21/debian/rules csv2latex-0.21/debian/rules
--- csv2latex-0.21/debian/rules 2018-07-02 23:52:26.0 +0200
+++ csv2latex-0.21/debian/rules 2019-12-28 21:47:35.0 +0100
@@ -6,3 +6,4 @@
 
 DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/csv2latex/
 
+export STRIP=true