[qtiplot] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages/qtiplot

[Scott Sheridan Howard]

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

showard pushed a commit to branch master
in repository qtiplot.

commit 8d6a78ac19668939e1c82e7a8325bcf134847b97
Merge: 174cc6d 5db8f43
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed Nov 20 14:13:21 2013 -0500

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages/qtiplot
    
    Conflicts:
    	debian/changelog

 debian/changelog                    |   12 +++++++++++-
 debian/control                      |   11 ++++++-----
 debian/patches/01_build_system.diff |   19 ++++++++-----------
 debian/patches/05_link_gl2ps.patch  |   16 ++++++----------
 4 files changed, 31 insertions(+), 27 deletions(-)

diff --cc debian/changelog
index 7194433,c9bfae1..f136137
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
- qtiplot (0.9.8.9-7) unstable; urgency=low
++qtiplot (0.9.8.9-8) unstable; urgency=low
 +
 +  * Fix FTBFS from new sip version (Closes: #728642, LP: #1243269)
 +
 + -- Scott Howard <showard at debian.org>  Sun, 17 Nov 2013 11:03:08 -0500
 +
+ qtiplot (0.9.8.9-7) unstable; urgency=high
+ 
+   * Team upload.
+   * [f4c910d] Link boost_system  explicitly. (Closes: #722323)
+   * [90606d7] Add texlive-lang-european to BD. Fix documentation generation.
+   * [b3f2561] Update Standards-Version to 3.9.4. No changes.
+   * [9530d73] Use canonical VCS.
+ 
+  -- Anton Gladky <gladk at debian.org>  Tue, 10 Sep 2013 16:14:00 +0200
+ 
  qtiplot (0.9.8.9-6) unstable; urgency=low
  
    * Fix bug were table columns could not be set (Closes: #707736)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qtiplot.git