Hi Dirk, thanks for your (mulitple) quick answer(s). I think a copy of basic /usr/share/R/debian/r-cran.mk with just my simple change is quite hard to maintain and thus pretty useless. However, in the long run it simply would make sense to support format 3.0 (quilt). If you are not happy with my patch I would rather consider a dh based alternative which I would prefer anyway over cdbs. So please make sure that you are deliberately refusing to support format 3.0 (quilt) and I will base my decision on your plans.
Kind regards Andreas. On Sat, Dec 17, 2011 at 11:42:48AM -0600, Dirk Eddelbuettel wrote: > > On 17 December 2011 at 18:23, Andreas Tille wrote: > | Hi, > | > | I used a private copy of r-cran.mk to work around this problem. > | Feel free to apply this patch: > > As I said, I cannot really afford any breakage, nor do I have time for > testing. > > So maybe I should just drop in a file > > /usr/share/R/debian/r-cran-no-simple-patchsys.mk > > you could use. > > That said, the patch looks pretty clean (and is a nice example of > shell-inside-make). > > Dirk > > > | $ diff -u /usr/share/R/debian/r-cran.mk r-cran_without_simple-patchsys.mk > | --- /usr/share/R/debian/r-cran.mk 2011-10-31 11:01:59.000000000 +0100 > | +++ r-cran_without_simple-patchsys.mk 2011-12-17 18:00:48.000000000 +0100 > | @@ -12,7 +12,12 @@ > | include /usr/share/cdbs/1/rules/debhelper.mk > | include /usr/share/cdbs/1/class/langcore.mk > | ## include /usr/share/cdbs/1/rules/dpatch.mk > | -include /usr/share/cdbs/1/rules/simple-patchsys.mk > | +# Check whether source format 3.0 (quilt) is used. If yes, do not include > the conflicting simple-patchsys.mk > | +formatfile := $(CURDIR)/debian/source/format > | +format_3_quilt = $(shell if [ -f $(formatfile) ] ; then if grep -q > '3.0[[:space:]]*(quilt)' $(formatfile) ; then echo 1 ; else echo 0 ; fi else > echo 0 ; fi ) > | +ifeq ($(format_3_quilt),0) > | + include /usr/share/cdbs/1/rules/simple-patchsys.mk > | +endif > | > | # awk command to extract word after Package or Bundle, not lowercased > | awkString := "'/^(Package|Bundle):/ {print $$2 }'" > | > | > | > | Kind regards > | > | Andreas. > | > | -- > | http://fam-tille.de > | > | > > -- > "Outside of a dog, a book is a man's best friend. Inside of a dog, it is too > dark to read." -- Groucho Marx > -- http://fam-tille.de -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org