[Pkg-giraffe-discuss] [PATCH 3/3] debian/rules: adjust the targets after dh version change

[Carsten Schoenert]

Am 18.12.2016 um 12:41 schrieb Guido Günther:
> Hi Carsten,
> comments inline.

Thanks!

>> On Sun, Dec 18, 2016 at 12:28:17PM +0100, c.schoenert at t-online.de wrote:
>> From: Carsten Schoenert <c.schoenert at t-online.de>
>>
>> ---
>>  debian/rules | 15 +++++++++++----
>>  1 file changed, 11 insertions(+), 4 deletions(-)
>>
>> diff --git a/debian/rules b/debian/rules
>> index 73aeaf3..383909c 100755
>> --- a/debian/rules
>> +++ b/debian/rules
>> @@ -13,12 +13,13 @@ else
>>      CFLAGS += -O2
>>  endif
>>  
>> +PACKAGE_BASE = "libvmime"
>>  CONFFLAG = "--enable-debug"
>>  
>> -CFLAGS = "-Wall -g -Wl,-z,defs"
>> +CFLAGS += -Wall -g -Wl,-z,defs
>>  
>>  DEB_CONFIGURE_EXTRA_ARGS :=      \
>> -    CFLAGS=$(CFLAGS) \
>> +    CFLAGS="$(CFLAGS)" \
> 
> Separate fix.

Agreed, will split of.

> 
>>      --host=$(DEB_HOST_GNU_TYPE) \
>>      --build=$(DEB_BUILD_GNU_TYPE) \
>>      --prefix=/usr \
>> @@ -31,16 +32,22 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
>>  	dh $@ --parallel
>>  
>>  override_dh_auto_clean:
>> -	[ ! -f Makefile ] || $(MAKE) clean
> 
> Why is that removed?

As the following line does quite the same. But it also doesn't hurt to
keep this alive, so remove the removing. :-)
One day far away we will have a cmake based new libvmime source.

>>  	rm -f Makefile src/Makefile vmime/Makefile vmime/config.hpp build-stamp libtool config.guess config.log config.sub config.status config.h vmime.pc stamp-h1
>>  	cd src ; rm -f `find . -type l`
>>  	dh_auto_clean
>>  
>> +override_dh_autoreconf:
>> +	touch autotools/config.rpath
>> +	dh_autoreconf
>> +
>>  override_dh_auto_configure:
>> -	[ -f ./bootstrap ] && ./bootstrap
>>  	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_ARGS)
>>  
>>  override_dh_install:
>> +	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ \
>> +		debian/$(PACKAGE_BASE)-dev.install.in > debian/$(PACKAGE_BASE)-dev.install
>> +	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ \
>> +		debian/$(PACKAGE_BASE)0.install.in > debian/$(PACKAGE_BASE)0.install
> 
> Shouldn't this be in the same patch as the move to .in files since it
> otherwise makes previous commits unbuildable?

Agreed. It's more logical to put these changes to the previous commit.

> You used dh-exec in other packages, why not here?

The last time I was trying to use dh-exec for this I got no success,
will take a look again and post a new series of patches later.

Thanks for reviewing!

-- 
Regards
Carsten Schoenert