This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository python-stetl.
commit 6470ce02d7971c9c477e27e8c6adb4474627afd9 Author: Bas Couwenberg <[email protected]> Date: Sat Jun 18 16:30:58 2016 +0200 Drop patches, fixed upstream. --- debian/changelog | 1 + debian/patches/docs-Makefile.patch | 159 ------------------------------------- debian/patches/series | 3 - debian/patches/tests-configs.patch | 17 ---- debian/patches/tests-data.patch | 24 ------ 5 files changed, 1 insertion(+), 203 deletions(-) diff --git a/debian/changelog b/debian/changelog index a8983af..3cadff7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-stetl (1.0.9+ds-1) UNRELEASED; urgency=medium * New upstream release. * Bump Standards-Version to 3.9.8, no changes. * Update stetl man page. + * Drop patches, fixed upstream. -- Bas Couwenberg <[email protected]> Sat, 18 Jun 2016 16:16:31 +0200 diff --git a/debian/patches/docs-Makefile.patch b/debian/patches/docs-Makefile.patch deleted file mode 100644 index ffe4733..0000000 --- a/debian/patches/docs-Makefile.patch +++ /dev/null @@ -1,159 +0,0 @@ -Description: Add Makefile to build documentation with Sphinx. -Origin: https://raw.githubusercontent.com/justb4/stetl/3c759b276911c10518d4298fd4104369a53efd9d/docs/Makefile - ---- /dev/null -+++ b/docs/Makefile -@@ -0,0 +1,153 @@ -+# Makefile for Sphinx documentation -+# -+ -+# You can set these variables from the command line. -+SPHINXOPTS = -+SPHINXBUILD = sphinx-build -+PAPER = -+BUILDDIR = _build -+ -+# Internal variables. -+PAPEROPT_a4 = -D latex_paper_size=a4 -+PAPEROPT_letter = -D latex_paper_size=letter -+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -+# the i18n builder cannot share the environment and doctrees with the others -+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -+ -+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext -+ -+help: -+ @echo "Please use \`make <target>' where <target> is one of" -+ @echo " html to make standalone HTML files" -+ @echo " dirhtml to make HTML files named index.html in directories" -+ @echo " singlehtml to make a single large HTML file" -+ @echo " pickle to make pickle files" -+ @echo " json to make JSON files" -+ @echo " htmlhelp to make HTML files and a HTML help project" -+ @echo " qthelp to make HTML files and a qthelp project" -+ @echo " devhelp to make HTML files and a Devhelp project" -+ @echo " epub to make an epub" -+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" -+ @echo " latexpdf to make LaTeX files and run them through pdflatex" -+ @echo " text to make text files" -+ @echo " man to make manual pages" -+ @echo " texinfo to make Texinfo files" -+ @echo " info to make Texinfo files and run them through makeinfo" -+ @echo " gettext to make PO message catalogs" -+ @echo " changes to make an overview of all changed/added/deprecated items" -+ @echo " linkcheck to check all external links for integrity" -+ @echo " doctest to run all doctests embedded in the documentation (if enabled)" -+ -+clean: -+ -rm -rf $(BUILDDIR) -+ -+html: -+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html -+ @echo -+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." -+ -+dirhtml: -+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml -+ @echo -+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." -+ -+singlehtml: -+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml -+ @echo -+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." -+ -+pickle: -+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle -+ @echo -+ @echo "Build finished; now you can process the pickle files." -+ -+json: -+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json -+ @echo -+ @echo "Build finished; now you can process the JSON files." -+ -+htmlhelp: -+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp -+ @echo -+ @echo "Build finished; now you can run HTML Help Workshop with the" \ -+ ".hhp project file in $(BUILDDIR)/htmlhelp." -+ -+qthelp: -+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp -+ @echo -+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \ -+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" -+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Stetl.qhcp" -+ @echo "To view the help file:" -+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Stetl.qhc" -+ -+devhelp: -+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp -+ @echo -+ @echo "Build finished." -+ @echo "To view the help file:" -+ @echo "# mkdir -p $$HOME/.local/share/devhelp/Stetl" -+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Stetl" -+ @echo "# devhelp" -+ -+epub: -+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub -+ @echo -+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub." -+ -+latex: -+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex -+ @echo -+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." -+ @echo "Run \`make' in that directory to run these through (pdf)latex" \ -+ "(use \`make latexpdf' here to do that automatically)." -+ -+latexpdf: -+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex -+ @echo "Running LaTeX files through pdflatex..." -+ $(MAKE) -C $(BUILDDIR)/latex all-pdf -+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." -+ -+text: -+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text -+ @echo -+ @echo "Build finished. The text files are in $(BUILDDIR)/text." -+ -+man: -+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man -+ @echo -+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man." -+ -+texinfo: -+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo -+ @echo -+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." -+ @echo "Run \`make' in that directory to run these through makeinfo" \ -+ "(use \`make info' here to do that automatically)." -+ -+info: -+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo -+ @echo "Running Texinfo files through makeinfo..." -+ make -C $(BUILDDIR)/texinfo info -+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." -+ -+gettext: -+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale -+ @echo -+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." -+ -+changes: -+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes -+ @echo -+ @echo "The overview file is in $(BUILDDIR)/changes." -+ -+linkcheck: -+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck -+ @echo -+ @echo "Link check complete; look for any errors in the above output " \ -+ "or in $(BUILDDIR)/linkcheck/output.txt." -+ -+doctest: -+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest -+ @echo "Testing of doctests in the sources finished, look at the " \ -+ "results in $(BUILDDIR)/doctest/output.txt." diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a7104ee..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -docs-Makefile.patch -tests-configs.patch -tests-data.patch diff --git a/debian/patches/tests-configs.patch b/debian/patches/tests-configs.patch deleted file mode 100644 index 78e2d96..0000000 --- a/debian/patches/tests-configs.patch +++ /dev/null @@ -1,17 +0,0 @@ -Description: Add config for tests. -Origin: https://raw.githubusercontent.com/justb4/stetl/3c759b276911c10518d4298fd4104369a53efd9d/tests/configs/copy_in_out.cfg - ---- /dev/null -+++ b/tests/configs/copy_in_out.cfg -@@ -0,0 +1,11 @@ -+# Trivial example of an ETL Chain that just copies a file to standard output. -+ -+[etl] -+chains = input_xml_file|output_std -+ -+[input_xml_file] -+class = inputs.fileinput.XmlFileInput -+file_path = tests/data/cities.xml -+ -+[output_std] -+class = outputs.standardoutput.StandardOutput diff --git a/debian/patches/tests-data.patch b/debian/patches/tests-data.patch deleted file mode 100644 index 49f9a9d..0000000 --- a/debian/patches/tests-data.patch +++ /dev/null @@ -1,24 +0,0 @@ -Description: Add data for tests. -Origin: https://raw.githubusercontent.com/justb4/stetl/3c759b276911c10518d4298fd4104369a53efd9d/tests/data/cities.xml - ---- /dev/null -+++ b/tests/data/cities.xml -@@ -0,0 +1,18 @@ -+<?xml version='1.0' encoding='utf-8'?> -+<cities> -+ <city> -+ <name>Amsterdam</name> -+ <lat>52.4</lat> -+ <lon>4.9</lon> -+ </city> -+ <city> -+ <name>Bonn</name> -+ <lat>50.7</lat> -+ <lon>7.1</lon> -+ </city> -+ <city> -+ <name>Rome</name> -+ <lat>41.9</lat> -+ <lon>12.5</lon> -+ </city> -+</cities> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-stetl.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
