Package/devscripts
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgpkg: devscripts 2.17.9-1

Browse Source 
- Version update.
- Rework patch to fix build issues.
This commit is contained in:
Giovanni Santini
2017-07-24 16:26:39 +02:00
parent a47152bab3
commit ad9dadb818
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.SRCINFO
View File

@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8 # Generated by mksrcinfo v8
# Fri May 26 10:00:21 UTC 2017 # Mon Jul 24 14:26:39 UTC 2017
pkgbase = devscripts pkgbase = devscripts
pkgdesc = Scripts to make the life of a Debian Package maintainer easier pkgdesc = Scripts to make the life of a Debian Package maintainer easier
pkgver = 2.17.5 pkgver = 2.17.9
pkgrel = 3 pkgrel = 1
url = http://packages.qa.debian.org/d/devscripts.html url = http://packages.qa.debian.org/d/devscripts.html
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = devscripts
makedepends = bash-completion makedepends = bash-completion
makedepends = git makedepends = git
makedepends = perl-file-desktopentry makedepends = perl-file-desktopentry
makedepends = perl-file-homedir
makedepends = perl-file-basedir makedepends = perl-file-basedir
makedepends = perl-git-wrapper makedepends = perl-git-wrapper
makedepends = perl-libwww makedepends = perl-libwww
@@ -29,10 +30,10 @@ pkgbase = devscripts
depends = perl-timedate depends = perl-timedate
optdepends = sensible-utils: for sensible alternative selection optdepends = sensible-utils: for sensible alternative selection
options = !makeflags options = !makeflags
source = devscripts::git+https://anonscm.debian.org/git/collab-maint/devscripts.git#tag=v2.17.5 source = devscripts::git+https://anonscm.debian.org/git/collab-maint/devscripts.git#tag=v2.17.9
source = fixes.patch source = fixes.patch
sha256sums = SKIP sha256sums = SKIP
sha256sums = 9d038e5425848734874a03e2bdc0c8b86b1f42e9626f37dd916c1b7d73ad9141 sha256sums = e5fef21e1d8aee3128c6499078bc2f38e8f80189b30882df817637388f1e7717
pkgname = devscripts pkgname = devscripts

13
PKGBUILD
View File

@@ -5,8 +5,8 @@
# Contributor: JD Horelick <jdhore1@gmail.com> # Contributor: JD Horelick <jdhore1@gmail.com>
pkgname=devscripts pkgname=devscripts
pkgver=2.17.5 pkgver=2.17.9
pkgrel=3 pkgrel=1
pkgdesc="Scripts to make the life of a Debian Package maintainer easier" pkgdesc="Scripts to make the life of a Debian Package maintainer easier"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://packages.qa.debian.org/d/devscripts.html" url="http://packages.qa.debian.org/d/devscripts.html"
@@ -18,6 +18,7 @@ makedepends=(
'bash-completion' 'bash-completion'
'git' 'git'
'perl-file-desktopentry' 'perl-file-desktopentry'
'perl-file-homedir'
'perl-file-basedir' 'perl-file-basedir'
'perl-git-wrapper' 'perl-git-wrapper'
'perl-libwww' 'perl-libwww'
@@ -34,11 +35,15 @@ source=(
fixes.patch fixes.patch
) )
sha256sums=('SKIP' sha256sums=('SKIP'
'9d038e5425848734874a03e2bdc0c8b86b1f42e9626f37dd916c1b7d73ad9141') 'e5fef21e1d8aee3128c6499078bc2f38e8f80189b30882df817637388f1e7717')
prepare(){
cd "$pkgname"
patch -p1 -i "$srcdir/fixes.patch"
}
build() { build() {
cd "$pkgname" cd "$pkgname"
patch -p1 -i "$srcdir/fixes.patch"
make make
} }

14
fixes.patch
View File

@@ -1,5 +1,5 @@
diff --git a/po4a/Makefile b/po4a/Makefile diff --git a/po4a/Makefile b/po4a/Makefile
index f19b24df..0c0dcd35 100644 index f19b24df..6a43f037 100644
--- a/po4a/Makefile --- a/po4a/Makefile
+++ b/po4a/Makefile +++ b/po4a/Makefile
@@ -28,7 +28,7 @@ de/%.de.1: de/%.de.pod translate @@ -28,7 +28,7 @@ de/%.de.1: de/%.de.pod translate
@@ -7,7 +7,7 @@ index f19b24df..0c0dcd35 100644
de/%.de.1: de/%.de.dbk translate de/%.de.1: de/%.de.dbk translate
xsltproc --nonet -o $@ \ xsltproc --nonet -o $@ \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+ /usr/share/xml/docbook/xsl-stylesheets-1.79.1/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 # 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 # to rename the file after it's generated
mv de/$*.1 $@ mv de/$*.1 $@
@@ -16,24 +16,24 @@ index f19b24df..0c0dcd35 100644
fr/%.fr.1: fr/%.fr.dbk translate fr/%.fr.1: fr/%.fr.dbk translate
xsltproc --nonet -o $@ \ xsltproc --nonet -o $@ \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+ /usr/share/xml/docbook/xsl-stylesheets-1.79.1/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 # 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 # to rename the file after it's generated
mv fr/$*.1 $@ mv fr/$*.1 $@
diff --git a/scripts/Makefile b/scripts/Makefile diff --git a/scripts/Makefile b/scripts/Makefile
index 931143a5..4696472c 100644 index ece5455a..78bdb942 100644
--- a/scripts/Makefile --- a/scripts/Makefile
+++ b/scripts/Makefile +++ b/scripts/Makefile
@@ -63,7 +63,7 @@ endif @@ -64,7 +64,7 @@ endif
pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
%.1: %.dbk %.1: %.dbk
xsltproc --nonet -o $@ \ xsltproc --nonet -o $@ \
- /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+ /usr/share/xml/docbook/xsl-stylesheets-1.79.1/manpages/docbook.xsl $< + /usr/share/xml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl $<
# There is a slight chance this gets called twice, once here from here and once # There is a slight chance this gets called twice, once here from here and once
# from ../po4a/Makefile. Treat files with care. # from ../po4a/Makefile. Treat files with care.
@@ -92,7 +92,7 @@ test: @@ -93,7 +93,7 @@ test:
$(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n)) $(foreach python,$(shell py3versions -r ../debian/control),$(python) setup.py test$(\n))
install: all install: all