summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-03-05 12:40:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-03-05 12:41:08 +0000
commitf887b042730baa2c37981672fb221f1fbc106772 (patch)
treeb5d21c9bcaded53e9929647b8afaeccedb08114e
parentMerging upstream version 0.13.4. (diff)
downloadliborcus-f887b042730baa2c37981672fb221f1fbc106772.zip
liborcus-f887b042730baa2c37981672fb221f1fbc106772.tar.xz
Merging debian version 0.13.4-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog10
-rw-r--r--debian/control3
-rw-r--r--debian/copyright2
-rw-r--r--debian/watch6
4 files changed, 17 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index d0d9516..4436b4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+liborcus (0.13.4-1) unstable; urgency=medium
+
+ * New upstream version 0.13.4
+
+ * add Built-Using: ${sphinxdoc:Built-Using} to liborcus-doc
+ * fix debian/watch and remove trailing / from Files-Excluded
+ * add Vcs-*
+
+ -- Rene Engelhard <rene@debian.org> Tue, 27 Feb 2018 16:13:41 +0100
+
liborcus (0.13.3-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index fc3cf2a..6824923 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,8 @@ Section: libs
Homepage: https://gitlab.com/orcus/orcus
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/liborcus
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/liborcus
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/libreoffice-team/liborcus
+XSBC-Original-Vcs-Git: https://salsa.debian.org/libreoffice-team/liborcus.git
Package: liborcus-dev
Section: libdevel
@@ -81,6 +83,7 @@ Description: library for processing spreadsheet documents - python bindings
Package: liborcus-doc
Section: doc
Architecture: all
+Built-Using: ${sphinxdoc:Built-Using}
Depends: ${misc:Depends}, ${sphinxdoc:Depends}
Description: library for processing spreadsheet documents - documentation
Orcus is a library that provides a collection of standalone file processing
diff --git a/debian/copyright b/debian/copyright
index c44e43a..b01c2e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: liborcus
Source: https://gitlab.com/orcus/orcus
-Files-Excluded: misc/ooxml-ecma-376/ misc/OpenDocument-v1.2-os-schema.rng
+Files-Excluded: misc/ooxml-ecma-376 misc/OpenDocument-v1.2-os-schema.rng
Files: *
Copyright: Copyright (c) 2010-2013 Kohei Yoshida
diff --git a/debian/watch b/debian/watch
index 4e9ea67..b144d09 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
-version=2
-opts=dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,filenamemangle=s/.*\.tar\.gz\?ref=v?(\d\S*)/orcus-$1\.tar\.gz/g \
- https://gitlab.com/orcus/orcus/tags .*archive\.tar\.gz\?ref=v?(\d\S*)
+version=4
+opts=downloadurlmangle=s|gitlab.com/orcus/orcus/repository/(@ANY_VERSION@)/archive.tar.gz|kohei.us/files/orcus/src/@PACKAGE@-$1.tar.xz|,repack,compression=xz \
+http://gitlab.com/orcus/orcus/tags .*/@ANY_VERSION@/archive\.tar\.gz