[python-stetl] 01/02: Merge tag 'debian/1.0.9+ds-1' into jessie-backports

Bas Couwenberg sebastic at debian.org
Fri Jun 24 17:01:12 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository python-stetl.

commit 8b814357a5851c3ec700f677ef009091db6370d2
Merge: e543413 3dcf968
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 24 18:45:12 2016 +0200

    Merge tag 'debian/1.0.9+ds-1' into jessie-backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 CHANGES.txt                            |  12 ++
 PKG-INFO                               |  54 ++++++---
 README.md                              |  38 ++++--
 VERSION.txt                            |   2 +-
 debian/changelog                       |   9 ++
 debian/control                         |   4 +-
 debian/man/stetl.1.xml                 |  17 +--
 debian/patches/docs-Makefile.patch     | 159 -------------------------
 debian/patches/series                  |   3 -
 debian/patches/tests-configs.patch     |  17 ---
 debian/patches/tests-data.patch        |  24 ----
 docker/Dockerfile                      |  44 +++++++
 docker/README.md                       |  38 ++++++
 docker/build.sh                        |   9 ++
 docker/test/1_copystd/etl.cfg          |  11 ++
 docker/test/1_copystd/etl.sh           |   9 ++
 docker/test/1_copystd/input/cities.xml |  18 +++
 docs/Makefile                          | 153 ++++++++++++++++++++++++
 docs/cases.rst                         |  88 ++++++++++++++
 docs/conf.py                           |   4 +-
 docs/index.rst                         |   2 +
 docs/install.rst                       |  14 +++
 docs/using.rst                         |  51 +++++++-
 examples/basics/6_cmdargs/etl.args     |   4 +
 examples/basics/6_cmdargs/etl.sh       |   9 +-
 examples/basics/readme.txt             |   6 +-
 examples/top10nl/etl-top10nl.cmd       |  17 +--
 examples/top10nl/etl-top10nl.props     |  28 +++++
 examples/top10nl/etl-top10nl.sh        |  17 +--
 examples/top10nl/readme.txt            |   2 +
 setup.py                               |   5 +-
 stetl/etl.py                           |   2 +-
 stetl/factory.py                       |   1 +
 stetl/filters/formatconverter.py       |   3 +
 stetl/filters/packetwriter.py          |  61 ++++++++++
 stetl/filters/templatingfilter.py      |  10 +-
 stetl/filters/xmlelementreader.py      | 133 +++++++++++++++++++++
 stetl/filters/zipfileextractor.py      |  70 +++++++++++
 stetl/inputs/fileinput.py              | 109 ++++++++++++++---
 stetl/main.py                          |  12 +-
 stetl/outputs/dboutput.py              |  91 ++++++++++++--
 stetl/outputs/execoutput.py            | 209 +++++++++++++++++++++++++++++++++
 stetl/packet.py                        |   1 +
 stetl/util.py                          |  30 +++++
 stetl/version.py                       |   2 +-
 tests/__init__.pyc                     | Bin 0 -> 134 bytes
 tests/configs/copy_in_out.cfg          |  11 ++
 tests/data/cities.xml                  |  18 +++
 tests/test_chain.pyc                   | Bin 0 -> 994 bytes
 49 files changed, 1316 insertions(+), 315 deletions(-)

diff --cc debian/changelog
index 9f90814,4466000..c533b7f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,19 @@@
+ python-stetl (1.0.9+ds-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Bump Standards-Version to 3.9.8, no changes.
+   * Update stetl man page.
+   * Drop patches, fixed upstream.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 18 Jun 2016 16:31:15 +0200
+ 
 +python-stetl (1.0.8+ds-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 21 Sep 2015 08:10:41 +0200
 +
  python-stetl (1.0.8+ds-2) unstable; urgency=medium
  
    * Add license & copyright for apachelog.py.
diff --cc debian/control
index bbe3fc7,2769688..a78ceee
--- a/debian/control
+++ b/debian/control
@@@ -17,9 -17,9 +17,9 @@@ Build-Depends: debhelper (>= 9)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 3.9.6
+ Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/python-stetl.git
- Vcs-Git: git://anonscm.debian.org/pkg-grass/python-stetl.git -b jessie-backports
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/python-stetl.git
++Vcs-Git: https://anonscm.debian.org/git/pkg-grass/python-stetl.git -b jessie-backports
  Homepage: http://stetl.org/
  
  Package: python-stetl

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-stetl.git



More information about the Pkg-grass-devel mailing list