diff -Nru dh-r-20180823/debian/changelog dh-r-20180912/debian/changelog --- dh-r-20180823/debian/changelog 2018-08-23 08:46:23.000000000 +0000 +++ dh-r-20180912/debian/changelog 2018-09-12 06:55:31.000000000 +0000 @@ -1,3 +1,13 @@ +dh-r (20180912) unstable; urgency=medium + + * scripts/create_README.source: If title is really short (only one word) + try to parse description + * Depends: libswitch-perl + Closes: #908643 + * Standards-Version: 4.2.1 + + -- Andreas Tille Wed, 12 Sep 2018 08:55:31 +0200 + dh-r (20180823) unstable; urgency=medium * Point freshly created watch files to cloud.r-project.org rather than diff -Nru dh-r-20180823/debian/control dh-r-20180912/debian/control --- dh-r-20180823/debian/control 2018-08-23 08:46:23.000000000 +0000 +++ dh-r-20180912/debian/control 2018-09-12 06:55:31.000000000 +0000 @@ -5,7 +5,7 @@ Section: science Priority: optional Build-Depends: debhelper (>= 11.3) -Standards-Version: 4.2.0 +Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/r-pkg-team/dh-r Vcs-Git: https://salsa.debian.org/r-pkg-team/dh-r.git @@ -15,7 +15,8 @@ r-base-dev, debhelper (>= 9), dctrl-tools, - libfile-which-perl + libfile-which-perl, + libswitch-perl Recommends: devscripts Description: Debian helper tools for packaging R libraries Provides the R package buildsystem for debhelper. diff -Nru dh-r-20180823/scripts/create_README.source dh-r-20180912/scripts/create_README.source --- dh-r-20180823/scripts/create_README.source 2018-08-23 08:46:23.000000000 +0000 +++ dh-r-20180912/scripts/create_README.source 2018-09-12 06:55:31.000000000 +0000 @@ -28,7 +28,7 @@ fi } -for rda in `find .. -iname "*.rda" -o -iname "*.rdata"` ; do +for rda in `find .. -iname "*.rda" -o -iname "*.rdata" | sort` ; do if echo $rda | grep -q "^\.\./data" ; then rdoc=`GuessDocName "../man/$(basename $rda .rda)"` if [ ! -e "$rdoc" ] ; then @@ -46,6 +46,12 @@ echo "Files: data/$(basename $rda)" echo $rdoc | sed 's#^\.\./#Documented: #' TITLE=$(grep '\\title' $rdoc | sed -e 's/^\\title{/ /' -e 's/ *} *$//') + DESCRIPTION=$(grep -A 3 '\\description' $rdoc | sed -e 's/^\\description{/ /' -e 's/ *} *$//' -e '/}/,$d' -e '/^[[:space:]]*$/d' -e 's/^ \+//') + if ! echo $TITLE | grep -q ' ' ; then + if [ "$DESCRIPTION" != "" ] ; then + TITLE=$DESCRIPTION + fi + fi if echo $TITLE | grep -q '^[[:space:]]*$' ; then sed -e '0,/^\\title{/d' -e '/^}/,$d' -e 's/^\\description{//' -e 's/^\([^ ]\)/ \1/' $rdoc else diff -Nru dh-r-20180823/TODO dh-r-20180912/TODO --- dh-r-20180823/TODO 2018-08-23 08:46:23.000000000 +0000 +++ dh-r-20180912/TODO 2018-09-12 06:55:31.000000000 +0000 @@ -3,3 +3,12 @@ of Debian have this version (will be removed by cme fix dpkg-control afterwards * Should keep comments + + +Versioned dependencies: + As explained in a bug against r-cran-adegraphics + https://bugs.debian.org/908065#25 + --> + adding a -~~ (or something along those lines) to any upstream version in + such relations will prevent an upstream hyphen from being treated as the + separator between the upstream version and the Debian revision number.