On 11-12-13 21:34, Andreas Tille wrote: > Hi Lennart, > > just commit+push your patch and I'll check. Done! Lennart. > > Kind regards > > Andreas. > > On Wed, Dec 11, 2013 at 05:10:01PM +0100, L.C. Karssen wrote: >> Hi Andreas, >> >> On 11-12-13 11:15, Andreas Tille wrote: >>> Hi Lennart, >>> >>> >>>> 2) 2x W: probabel: script-with-language-extension >>>> This is something we discuss upstream. One of them can be fixed >>>> relatively easily, I think. The other one may interfere too much with >>>> what users currently expect/existing workflows. My feeling is that >>>> removing the extension will require a major version jump and good >>>> communication with the users/their sysadmins. >>> >> >> For the extIDS.pl file I would like to solve the problem by installing >> it in the examples directory (that's where it actually belongs, it's not >> required for regular use) instead of /usr/bin/. To this end I want to >> patch the src/Makefile.am file, which I would then send upstream. >> >> I've set up dquilt according to sections 3.1 and 3.2 of >> http://www.debian.org/doc/manuals/maint-guide/modify.en.html. >> Next I took the following steps (as outlined in the URL): >> dquilt new fix-extIDS.pl.patch >> dquilt add src/Makefile.am >> <edit src/Makefile.am> >> dquilt refresh >> dquilt header -e >> <edit patch info> >> >> However, neither debuild, nor pdebuild seems to pick up the patch. The >> patch itself seems ok: >> >> $ less debian/patches/fix-extIDS.pl.patch >> Description: Fix Makefile.am to install extIDS.pl in a more correct location >> This patch will be sent upstream. >> Forwarded: TODO >> Author: Lennart C. Karssen <lennart@karssen.org> >> Last-Update: 2013-12-11 >> >> +++ b/src/Makefile.am >> @@ -75,11 +75,11 @@ >> extract_snp_SOURCES = extract-snp.cpp $(FVSRC) $(FVHEADERS) >> >> ## Install these scripts in the bin directory as well: >> -dist_bin_SCRIPTS = probabel.pl extIDS.pl >> +dist_bin_SCRIPTS = probabel.pl >> >> -## Install this R script in the examples directory >> +## Install these scripts in the examples directory >> scriptdir = $(pkgdatadir)/scripts >> -dist_script_DATA = prepare_data.R >> +dist_script_DATA = prepare_data.R extIDS.pl >> >> ## Install the config file >> dist_sysconf_DATA = probabel_config.cfg.example >> >> >> Any suggestions? >> >> Thanks, >> >> Lennart. >> >> -- >> *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* >> L.C. Karssen >> Utrecht >> The Netherlands >> >> lennart@karssen.org >> http://blog.karssen.org >> GPG key ID: A88F554A >> -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*- >> > > > -- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* L.C. Karssen Utrecht The Netherlands lennart@karssen.org http://blog.karssen.org GPG key ID: A88F554A -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-
Attachment:
signature.asc
Description: OpenPGP digital signature