[arch-commits] Commit in dblatex/trunk (2 files)

[Lukas Fleischer]

    Date: Thursday, May 18, 2017 @ 17:44:19
  Author: lfleischer
Revision: 228486

upgpkg: dblatex 0.3.10-1

Upstream update.

Modified:
  dblatex/trunk/PKGBUILD
Deleted:
  dblatex/trunk/dblatex-0.3.9-drop-multirow-dependency.patch

----------------------------------------------+
 PKGBUILD                                     |   17 +++--------
 dblatex-0.3.9-drop-multirow-dependency.patch |   36 -------------------------
 2 files changed, 5 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-18 17:37:35 UTC (rev 228485)
+++ PKGBUILD	2017-05-18 17:44:19 UTC (rev 228486)
@@ -3,24 +3,17 @@
 # Contributor: Andreas Hauser <andy-aur at splashground.de>
 
 pkgname=dblatex
-pkgver=0.3.9
-pkgrel=2
+pkgver=0.3.10
+pkgrel=1
 pkgdesc='DocBook (XML and SGML) to DVI, PDF, PostScript converter using latex.'
 arch=('any')
 url='http://dblatex.sourceforge.net/'
 license=('GPL')
 depends=('docbook-xsl' 'docbook-xml' 'libxslt' 'python2' 'texlive-core' 'texlive-htmlxml'
-         'texlive-latexextra' 'texlive-pictures')
-source=("https://downloads.sourceforge.net/project/dblatex/dblatex/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        dblatex-0.3.9-drop-multirow-dependency.patch)
-md5sums=('38e9fd93dd37d71e352010ad40e1dfb4'
-         '2ccaf937d0de48c9c283ed0c0f7af5a7')
+         'texlive-latexextra' 'texlive-pictures' 'texlive-science')
+source=("https://downloads.sourceforge.net/project/dblatex/dblatex/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('437513c07101cefe5be3cbe83f313878')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../dblatex-0.3.9-drop-multirow-dependency.patch
-}
-
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: dblatex-0.3.9-drop-multirow-dependency.patch
===================================================================
--- dblatex-0.3.9-drop-multirow-dependency.patch	2017-05-18 17:37:35 UTC (rev 228485)
+++ dblatex-0.3.9-drop-multirow-dependency.patch	2017-05-18 17:44:19 UTC (rev 228486)
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User marsgui
-# Date 1476384175 -7200
-#      Thu Oct 13 20:42:55 2016 +0200
-# Node ID 4f030d62420c3101d85976f5017b29070d1277b4
-# Parent  58ff524b7f0f0b8127333ba9542c9619dbdd4dbf
-Fix Debian bug #840189: drop multirow dependency
-
-diff -r 58ff524b7f0f -r 4f030d62420c latex/style/dbk_table.sty
---- a/latex/style/dbk_table.sty	Sun Oct 02 23:21:03 2016 +0200
-+++ b/latex/style/dbk_table.sty	Thu Oct 13 20:42:55 2016 +0200
-@@ -9,7 +9,6 @@
- \usepackage{longtable}
- \usepackage{lscape}
- \usepackage{colortbl}
--\usepackage{multirow}
- \usepackage{calc}
- \usepackage{hhline}
- 
-@@ -21,16 +20,6 @@
-   \expandafter[\expandafter3\expandafter]\expandafter{%
-   \multicolumn{#1}{#2}{#3}}
- 
--% Make \@xmultirow long
--\expandafter\long\expandafter\def%
--\expandafter\@xmultirow%
--\expandafter#\expandafter1%
--\expandafter[\expandafter#\expandafter2\expandafter]%
--\expandafter#\expandafter3%
--\expandafter[\expandafter#\expandafter4\expandafter]%
--\expandafter#\expandafter5%
--\expandafter{\@xmultirow{#1}[#2]{#3}[#4]{#5}}
--
- % For the newtbl code
- \newdimen\newtblstarfactor%
- \newdimen\newtblsparewidth%