upgpkg: devscripts 2.21.2-1
- Updated the patch for newer devscripts: https://github.com/ItachiSan/linux_packaging/issues/8 - Added missing optdepts for `uscan`: https://github.com/ItachiSan/linux_packaging/issues/9
This commit is contained in:
Giovanni Santini
11
.SRCINFO
11
.SRCINFO
@@ -1,6 +1,6 @@
|
||||
pkgbase = devscripts
|
||||
pkgdesc = Scripts to make the life of a Debian Package maintainer easier
|
||||
pkgver = 2.21.1
|
||||
pkgver = 2.21.2
|
||||
pkgrel = 1
|
||||
url = https://tracker.debian.org/pkg/devscripts
|
||||
arch = i686
|
||||
@@ -30,11 +30,12 @@ pkgbase = devscripts
|
||||
depends = perl-timedate
|
||||
depends = sensible-utils
|
||||
optdepends = debian-keyring: Required for commands interacting with the system / user keyring
|
||||
optdepends = perl-file-touch: Required for uscan
|
||||
optdepends = perl-file-dirlist: Required for uscan
|
||||
options = !makeflags
|
||||
source = https://deb.debian.org/debian/pool/main/d/devscripts/devscripts_2.21.1.tar.xz
|
||||
source = https://deb.debian.org/debian/pool/main/d/devscripts/devscripts_2.21.2.tar.xz
|
||||
source = fixes.patch
|
||||
sha256sums = d596c8894ac5777f2e3152f2ed86b22cb9b946b99ca2fb00fbe2536fc3db4c52
|
||||
sha256sums = e5fef21e1d8aee3128c6499078bc2f38e8f80189b30882df817637388f1e7717
|
||||
sha256sums = c32db3f5b62c30d4ac77724c1ab2eb241eb4b9a1d9ea24bd762eba4d6b07ed32
|
||||
sha256sums = f8e7ce50c0d008c5d38c94b93c9fc560e5dd2cc8f06eeb2909b0b1784911b768
|
||||
|
||||
pkgname = devscripts
|
||||
|
||||
|
||||
8
PKGBUILD
8
PKGBUILD
@@ -5,7 +5,7 @@
|
||||
# Contributor: JD Horelick <jdhore1@gmail.com>
|
||||
|
||||
pkgname=devscripts
|
||||
pkgver=2.21.1
|
||||
pkgver=2.21.2
|
||||
pkgrel=1
|
||||
pkgdesc="Scripts to make the life of a Debian Package maintainer easier"
|
||||
arch=('i686' 'x86_64')
|
||||
@@ -31,14 +31,16 @@ makedepends=(
|
||||
)
|
||||
optdepends=(
|
||||
'debian-keyring: Required for commands interacting with the system / user keyring'
|
||||
'perl-file-touch: Required for uscan'
|
||||
'perl-file-dirlist: Required for uscan'
|
||||
)
|
||||
options=('!makeflags')
|
||||
source=(
|
||||
"https://deb.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver}.tar.xz"
|
||||
fixes.patch
|
||||
)
|
||||
sha256sums=('d596c8894ac5777f2e3152f2ed86b22cb9b946b99ca2fb00fbe2536fc3db4c52'
|
||||
'e5fef21e1d8aee3128c6499078bc2f38e8f80189b30882df817637388f1e7717')
|
||||
sha256sums=('c32db3f5b62c30d4ac77724c1ab2eb241eb4b9a1d9ea24bd762eba4d6b07ed32'
|
||||
'f8e7ce50c0d008c5d38c94b93c9fc560e5dd2cc8f06eeb2909b0b1784911b768')
|
||||
|
||||
prepare(){
|
||||
cd "$pkgname-$pkgver"
|
||||
|
||||
51
fixes.patch
51
fixes.patch
@@ -1,40 +1,29 @@
|
||||
diff --git a/po4a/Makefile b/po4a/Makefile
|
||||
index f19b24df..6a43f037 100644
|
||||
--- a/po4a/Makefile
|
||||
+++ b/po4a/Makefile
|
||||
@@ -28,7 +28,7 @@ de/%.de.1: de/%.de.pod translate
|
||||
pod2man --utf8 --center=" " --release="Debian-Hilfswerkzeuge" $< > $@
|
||||
de/%.de.1: de/%.de.dbk translate
|
||||
xsltproc --nonet -o $@ \
|
||||
diff -urN devscripts-2.21.2/po4a/Makefile devscripts-2.21.2_patched/po4a/Makefile
|
||||
--- devscripts-2.21.2/po4a/Makefile 2021-03-16 14:16:39.000000000 +0100
|
||||
+++ devscripts-2.21.2_patched/po4a/Makefile 2021-06-10 12:31:21.021880200 +0200
|
||||
@@ -34,7 +34,7 @@
|
||||
pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@
|
||||
%.1:: %.dbk translate
|
||||
xsltproc --nonet \
|
||||
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
|
||||
+ /usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl $<
|
||||
# xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have
|
||||
# to rename the file after it's generated
|
||||
mv de/$*.1 $@
|
||||
@@ -41,7 +41,7 @@ fr/%.fr.1: fr/%.fr.pod translate
|
||||
pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@
|
||||
fr/%.fr.1: fr/%.fr.dbk translate
|
||||
xsltproc --nonet -o $@ \
|
||||
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
|
||||
+ /usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl $<
|
||||
# xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have
|
||||
# to rename the file after it's generated
|
||||
mv fr/$*.1 $@
|
||||
diff --git a/scripts/Makefile b/scripts/Makefile
|
||||
index ece5455a..78bdb942 100644
|
||||
--- a/scripts/Makefile
|
||||
+++ b/scripts/Makefile
|
||||
@@ -64,7 +64,7 @@ endif
|
||||
+ /usr/share/xml/docbook/xsl-stylesheets-$(shell pacman -Q docbook-xsl | sed -E 's|.* ([0-9.]+)-.*|\1|')/manpages/docbook.xsl $<
|
||||
# /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/other.xsl
|
||||
# (which is imported by the above stylesheet) insists in writing the output
|
||||
# to where it wants to. we can only move the file ourselves.
|
||||
diff -urN devscripts-2.21.2/scripts/Makefile devscripts-2.21.2_patched/scripts/Makefile
|
||||
--- devscripts-2.21.2/scripts/Makefile 2021-03-16 14:16:39.000000000 +0100
|
||||
+++ devscripts-2.21.2_patched/scripts/Makefile 2021-06-10 12:35:12.481880200 +0200
|
||||
@@ -87,7 +87,7 @@
|
||||
pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
|
||||
%.1: %.dbk
|
||||
xsltproc --nonet -o $@ \
|
||||
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
|
||||
+ /usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl $<
|
||||
+ /usr/share/xml/docbook/xsl-stylesheets-$(shell pacman -Q docbook-xsl | sed -E 's|.* ([0-9.]+)-.*|\1|')/manpages/docbook.xsl $<
|
||||
|
||||
# There is a slight chance this gets called twice, once here from here and once
|
||||
# from ../po4a/Makefile. Treat files with care.
|
||||
@@ -93,7 +93,7 @@ test:
|
||||
$(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
|
||||
# Syntax checker
|
||||
test_sh: $(SH_CHECKS)
|
||||
@@ -142,7 +142,7 @@
|
||||
test: test_pl test_sh test_py
|
||||
|
||||
install: all
|
||||
- python3 setup.py install --root="$(DESTDIR)" --no-compile --install-layout=deb
|
||||
|
||||
Reference in New Issue
Block a user