[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: warning: patches have not been applied, applying them now (use --no-preparation to override)



On Tue, 01 Feb 2011 12:29:22 +0100, Mathieu Malaterre wrote:

>  Build-Depends: debhelper (>= 7), autoconf, autotools-dev, zlib1g-dev,
> libtiff4-dev,
> - libpng12-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen, quilt, graphviz
> + libpng12-dev, libxml2-dev, libwrap0-dev, libssl-dev, doxygen, quilt,
> graphviz, autotools-dev
> ...

Now you have autotools-dev both in B-D and in B-D-I. IMO B-D is
correct since it is (well: should be) used (also) in the clean
target.
 
> clean: unpatch
> 	dh_testdir
> 	dh_testroot
> ...
> ifneq "$(wildcard /usr/share/misc/config.sub)" ""
> 	cp -f /usr/share/misc/config.sub config/config.sub
> endif
> ifneq "$(wildcard /usr/share/misc/config.guess)" ""
> 	cp -f /usr/share/misc/config.guess config/config.guess
> endif
> 
> 	dh_clean
> 
> 
> Should I be doing something else ?

Read the docs :)
man dh_autotools-dev_updateconfig

I'm not at my development machines now; a quick search shows:
http://www.vdmeulen.net/cgi-bin/man/man2html?dh_autotools-dev_updateconfig+1
http://www.vdmeulen.net/cgi-bin/man/man2html?dh_autotools-dev_restoreconfig+1
which implies that -- with the short dh(1) format --, "dh --with
autotools_dev $@" is the simplest way to move config.* back and forth
automagically. But there are also examples for your current style of
debian/rules.)

Cheers,
gregor

-- 
 .''`.   http://info.comodo.priv.at/ -- GPG key IDs: 0x8649AA06, 0x00F3CFE4
 : :' :  Debian GNU/Linux user, admin, & developer - http://www.debian.org/
 `. `'   Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe
   `-    A woman should have compassion.  -- Kirk, "Catspaw", stardate 3018.2 


Reply to: