Bug#882131: wrap-and-sort should not re-order across comments

[Julian Andres Klode]

Package: devscripts
Version: 2.17.11
Severity: wishlist
File: /usr/bin/wrap-and-sort

In apt.maintscript, we remove two conffiles. For the second one, a comment
is added, but wrap-and-sort helpfully moves the first one after that comment,
completely confusing the file:

diff --git a/debian/apt.maintscript b/debian/apt.maintscript
index 296f83bd5..72a080263 100644
--- a/debian/apt.maintscript
+++ b/debian/apt.maintscript
@@ -1,3 +1,3 @@
-rm_conffile /etc/apt/apt.conf.d/20changelog 1.2.4~
 # we use a systemd timer unit now
+rm_conffile /etc/apt/apt.conf.d/20changelog 1.2.4~
 rm_conffile /etc/cron.daily/apt 1.2.10~

Sorting should only be done between comments.

-- Package-specific info:

--- /etc/devscripts.conf ---

--- ~/.devscripts ---
DEBSIGN_PROGRAM=gpg2
DEBUILD_PREPEND_PATH="/usr/lib/ccache"
DEBUILD_SET_ENVVAR_DEB_BUILD_OPTIONS=parallel=6

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (900, 'testing'), (800, 'unstable'), (500, 'unstable-debug'), (100, 'experimental'), (1, 'experimental-debug')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_IE.UTF-8, LC_CTYPE=en_IE.UTF-8 (charmap=UTF-8), LANGUAGE=en_IE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages devscripts depends on:
ii  dpkg-dev              1.19.0.4
ii  libc6                 2.24-17
ii  libfile-homedir-perl  1.002-1
ii  perl                  5.26.1-2
ii  python3               3.6.3-2
ii  sensible-utils        0.0.11

Versions of packages devscripts recommends:
ii  apt                         1.6~alpha5
ii  at                          3.1.20-3.1
ii  curl                        7.56.1-1
ii  dctrl-tools                 2.24-2+b1
ii  debian-keyring              2017.08.28
ii  dput-ng [dput]              1.15
ii  equivs                      2.1.0
ii  fakeroot                    1.22-2
ii  file                        1:5.32-1
ii  gnupg                       2.2.2-1
ii  gnupg2                      2.2.2-1
ii  libdistro-info-perl         0.17
ii  libdpkg-perl                1.19.0.4
ii  libencode-locale-perl       1.05-1
ii  libgit-wrapper-perl         0.047-1
ii  liblist-compare-perl        0.53-1
ii  liblwp-protocol-https-perl  6.07-2
ii  libsoap-lite-perl           1.22-1
ii  liburi-perl                 1.72-2
ii  libwww-perl                 6.27-1
ii  licensecheck                3.0.31-2
ii  lintian                     2.5.59
ii  man-db                      2.7.6.1-2
ii  patch                       2.7.5-1+b2
ii  patchutils                  0.3.4-2
ii  python3-apt                 1.4.0~beta3+b1
ii  python3-debian              0.1.31
ii  python3-magic               1:5.32-1
ii  python3-requests            2.18.1-1
ii  python3-unidiff             0.5.4-1
ii  python3-xdg                 0.25-4
ii  strace                      4.19-1
ii  unzip                       6.0-21
ii  wdiff                       1.2.2-2
ii  wget                        1.19.2-1
ii  xz-utils                    5.2.2-1.3

Versions of packages devscripts suggests:
pn  adequate                     <none>
pn  autopkgtest                  <none>
pn  bls-standalone               <none>
ii  bsd-mailx [mailx]            8.1.2-0.20160123cvs-4
ii  build-essential              12.4
pn  check-all-the-things         <none>
pn  cvs-buildpackage             <none>
pn  devscripts-el                <none>
ii  diffoscope                   88
pn  disorderfs                   <none>
pn  dose-extra                   <none>
pn  duck                         <none>
pn  faketime                     <none>
ii  gnuplot-x11 [gnuplot]        5.2.2+dfsg1-2
ii  gpgv                         2.2.2-1
ii  gpgv2                        2.2.2-1
pn  how-can-i-help               <none>
pn  libauthen-sasl-perl          <none>
pn  libfile-desktopentry-perl    <none>
pn  libnet-smtps-perl            <none>
pn  libterm-size-perl            <none>
ii  libtimedate-perl             2.3000-2
pn  libyaml-syck-perl            <none>
pn  mozilla-devscripts           <none>
ii  mutt                         1.8.3+neomutt20170609-2+b1
ii  openssh-client [ssh-client]  1:7.6p1-2
pn  piuparts                     <none>
ii  quilt                        0.63-8.1
pn  ratt                         <none>
pn  reprotest                    <none>
pn  svn-buildpackage             <none>
ii  w3m                          0.5.3-34

-- no debconf information

-- 
Debian Developer - deb.li/jak | jak-linux.org - free software dev
Ubuntu Core Developer                              de, en speaker