b6bcd8cd34
* daemontools and dmraid is kept at -Np0
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
22 lines
1 KiB
Diff
22 lines
1 KiB
Diff
From: Boyuan Yang <byang@debian.org>
|
|
Date: Tue, 2 Jun 2020 22:11:52 -0400
|
|
Subject: catalog.xml: Compatibility with 1.79.1 or earlier
|
|
|
|
The docbook-xsl project changed the canonical URI since 1.79.2.
|
|
Besides changes made in debian/*.xmlcatalogs files, this patch
|
|
completes the support of the old URI so that existing software
|
|
does not break with changed registered URI.
|
|
|
|
Forwarded: not-needed
|
|
Last-Update: 2020-06-02
|
|
|
|
--- a/catalog.xml
|
|
+++ b/catalog.xml
|
|
@@ -5,4 +5,7 @@
|
|
<rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl/current/" rewritePrefix="./"/>
|
|
<rewriteURI uriStartString="http://cdn.docbook.org/release/xsl/1.79.2/" rewritePrefix="./"/>
|
|
<rewriteSystem systemIdStartString="http://cdn.docbook.org/release/xsl/1.79.2/" rewritePrefix="./"/>
|
|
+ <!-- Also support old URI of v1.79.1 or earlier -->
|
|
+ <rewriteURI uriStartString="http://docbook.sourceforge.net/release/xsl-ns/current/" rewritePrefix="./"/>
|
|
+ <rewriteSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl-ns/current/" rewritePrefix="./"/>
|
|
</catalog>
|