Merge remote-tracking branch 'origin/github/pr/92'

diff --git a/debian/changelog b/debian/changelog
index 01062e8..17ca7d6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+grml-etc-core (0.16.2) grml-testing; urgency=medium
+
+  [ Doan Tran Cong Danh ]
+  * [2c241ec] zsh: commit-to-history: keep escaped character
+
+  [ Michael Prokop ]
+  * [675c85b] zshrc: support PAGER='less -Mr' usage and fall back to vi if
+    LESSOPEN is unset. Thanks to András Korn for review and improvement
+    suggestions
+  * [7ece114] doc: adjust txt2tags usage for versions >=3.3
+  * [b4ea931] Bump Standards-Version to 4.5.0
+  * [5b98679] Bump Debian compat version to 12, using debhelper-compat
+    approach
+  * [9cb82a3] Execute 'wrap-and-sort -a -t -s' on debian/
+
+ -- Michael Prokop <mika@grml.org>  Tue, 12 May 2020 17:09:53 +0200
+
 grml-etc-core (0.16.1) grml-testing; urgency=medium
 
   [ Doan Tran Cong Danh ]

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10

diff --git a/debian/control b/debian/control
index af1559b..5b8e139 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: grml-etc-core
 Section: grml
 Priority: optional
 Maintainer: Michael Prokop <mika@grml.org>
-Build-Depends: debhelper (>= 10~),
-               txt2tags
-Standards-Version: 4.3.0
+Build-Depends:
+ debhelper-compat (= 12),
+ txt2tags,
+Standards-Version: 4.5.0
 Homepage: https://git.grml.org/?p=grml-etc-core.git
 Vcs-git: git://git.grml.org/grml-etc-core.git
 Vcs-Browser: https://git.grml.org/?p=grml-etc-core.git
@@ -13,13 +14,18 @@ Bugs: mailto:bugs@grml.org
 
 Package: grml-etc-core
 Architecture: all
-Conflicts: grml-autoconfig (<< 0.5-7),
-           grml-etc (<< 0.8-11),
-           grml-scripts (<< 0.8-27)
-Replaces: vim-common
-Depends: vim | nvi | editor
-Recommends: grml-scripts-core
-Pre-Depends: zsh
+Conflicts:
+ grml-autoconfig (<< 0.5-7),
+ grml-etc (<< 0.8-11),
+ grml-scripts (<< 0.8-27),
+Replaces:
+ vim-common,
+Depends:
+ vim | nvi | editor,
+Recommends:
+ grml-scripts-core,
+Pre-Depends:
+ zsh,
 Description: core etcetera files for the Grml system
  This package includes some /etc files for the
  Grml system. Whereas the main grml-etc package is

diff --git a/debian/rules b/debian/rules
index 7bf93ff..ca1b5ad 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,17 +17,15 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
-
-       dh_clean 
+       dh_prep
        rm -rf debian/grml-etc-core/
        (cd $(CURDIR)/doc && $(MAKE) clean)
 
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k 
+       dh_prep
        dh_installdirs
-
        # Add here commands to install the package into debian/grml-etc-core.
        cp -a etc/ debian/grml-etc-core/
        cp -a usr_share_grml/ debian/grml-etc-core/usr/share/grml

diff --git a/doc/Makefile b/doc/Makefile
index c9c2d0c..28a83b8 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,7 +12,7 @@ all: $(MANPAGES) $(HTMLPAGES)
 
 .t2t.html:
        @printf 'TXT2TAGS %s > %s\n' "$<" "$@"
-       @txt2tags --target xhtml --css-sugar --style t2t-modern.css -o- $< \
+       @txt2tags --target html --style t2t-modern.css -o- $< \
 | sed -e '/^$$/d' -e 's/^\\$$//' > $@
 
 clean: