[sardana] 02/03: Import Debian patch 2.1.1-1~exp1
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Oct 31 16:46:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository sardana.
commit 7f24d820ea714dd3c0479cc23e7a1dfda83596c2
Merge: 97529f8 09fc775
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Sep 30 10:59:28 2016 +0200
Import Debian patch 2.1.1-1~exp1
PKG-INFO | 4 +-
debian/changelog | 6 +
debian/source/local-options | 1 -
doc/man/MacroServer.1 | 4 +-
doc/man/Pool.1 | 4 +-
doc/man/Sardana.1 | 4 +-
doc/man/diffractometeralignment.1 | 4 +-
doc/man/hklscan.1 | 4 +-
doc/man/macroexecutor.1 | 4 +-
doc/man/sequencer.1 | 4 +-
doc/man/spock.1 | 389 +--------------------
doc/man/ubmatrix.1 | 4 +-
doc/source/users/getting_started/installing.rst | 152 +++++---
setup.py | 4 +-
src/sardana/release.py | 2 +-
src/sardana/spock/ipython_00_10/genutils.py | 6 +-
src/sardana/spock/ipython_00_11/genutils.py | 6 +-
src/sardana/spock/ipython_01_00/genutils.py | 8 +-
src/sardana/spock/release.py | 2 +-
src/sardana/spock/spockms.py | 2 +-
src/sardana/taurus/core/tango/sardana/pool.py | 9 +-
.../qt/qtgui/extra_macroexecutor/dooroutput.py | 31 +-
22 files changed, 167 insertions(+), 487 deletions(-)
diff --cc debian/changelog
index 7c157cb,0000000..792e99e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,104 -1,0 +1,110 @@@
++sardana (2.1.1-1~exp1) experimental; urgency=medium
++
++ * New upstream version 2.1.1
++
++ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 30 Sep 2016 10:59:28 +0200
++
+sardana (2.1.0-1~exp1) experimental; urgency=medium
+
+ * New upstream version 2.1.0
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 13 Sep 2016 20:41:26 +0200
+
+sardana (2.0.0-1) unstable; urgency=medium
+
+ * Imported Upstream version 2.0.0
+ * Fixed VCS-x urls with cme
+ * debian/control
+ - Depends: gir1.2-hkl-5.0
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 29 Apr 2016 00:58:49 +0200
+
+sardana (1.6.1-1) unstable; urgency=medium
+
+ * Imported Upstream version 1.6.1
+ * debian/control
+ - Depends: taurus (>= 3.6.0+dfsg-1~)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Tue, 28 Jul 2015 15:16:42 +0200
+
+sardana (1.5.0-1~exp1) experimental; urgency=medium
+
+ * Imported Upstream version 1.5.0
+ * Standards-Version bump to 3.9.6 (nothing to do)
+ * debian/watch use the pypi redirector.
+ * debian/control
+ + Depends: taurus >= 3.4.0+dfsg-1~
+ + Build-Depends: texlive-latex-base, texlive-latex-extra, dvipng
+ for the documentation
+ + Build-Depends: dh-python which was missing
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 06 Feb 2015 18:38:07 +0100
+
+sardana (1.4.2-1) unstable; urgency=high
+
+ * Imported Upstream version 1.4.2
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 27 Oct 2014 12:11:35 +0100
+
+sardana (1.4.0-1) unstable; urgency=low
+
+ * Imported Upstream version 1.4.0
+ * debian/control
+ - Add Breaks, Replaces for python-taurus (<< 3.3.0+dfsg-2~)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Wed, 06 Aug 2014 09:49:59 +0200
+
+sardana (1.3.1-2) unstable; urgency=medium
+
+ * debian/control
+ - python-sardana: Depends python-nxs | libnexus0-python
+ to prepare the backport.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 13 Apr 2014 12:08:37 +0200
+
+sardana (1.3.1-1) unstable; urgency=medium
+
+ * Imported Upstream version 1.3.1
+ * debian/patches
+ - 0001-forwarded-upstream-install-also-the-ipython_01_00-mo.patch (removed)
+ * debian/control
+ - Depends: ipython-qtconsole for spock
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 17 Feb 2014 13:52:26 +0100
+
+sardana (1.3.0-1) unstable; urgency=medium
+
+ * Imported Upstream version 1.3.0
+ * Bump Standard-Versions to 3.9.5 (Nothing to do)
+ * debian/control
+ - Improve the sardana package description.
+ Thanks to Justin B Rye for this (Closes: #735164)
+ * debian/patches
+ - 0001-fix-the-FTBFS-until-the-PyTango-binding-is-fixed.patch
+ the real problem was sphinx 1.2.0, now that 1.2.1 is available
+ remove the patch.
+ + 0001-forwarded-upstream-install-also-the-ipython_01_00-mo.patch
+ the default upstream forgot to install the ipython_01_00 module
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Sun, 16 Feb 2014 07:21:33 +0100
+
+sardana (1.2.0-2) unstable; urgency=low
+
+ * debian/control
+ - Add Depends:python-nxs to allow NeXuS file generation
+ * debian/rules
+ - export http_proxy='localhost' to avoid internet download during
+ the build (Closes: #735161)
+ - remove duplication in the documentation package
+ * debian/patch
+ + 0001-fix-the-FTBFS-until-the-PyTango-binding-is-fixed.patch
+ remove the inheritance-diagram from the documentation
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Mon, 09 Sep 2013 11:26:31 +0200
+
+sardana (1.2.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #717871)
+ * Thanks to Justin B Rye for package description review
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 26 Jul 2013 18:53:05 +0200
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sardana.git
More information about the debian-science-commits
mailing list