[sunflow] 01/03: Merge branch 'master' into wheezy-backports

[Gabriele Giacone]

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

gg0-guest pushed a commit to branch wheezy-backports
in repository sunflow.

commit c4d2533269dec8a5f0c35acc3082dbb0b42ae9ec
Merge: cbcdd7b e600d81
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Thu Dec 18 11:44:04 2014 +0100

    Merge branch 'master' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog                       |  22 ++++++
 debian/compat                          |   2 +-
 debian/control                         |  13 ++--
 debian/patches/10_to_use_system_janino |   4 +-
 debian/patches/30_sweethome3d          | 124 +++++++++++++++++----------------
 5 files changed, 95 insertions(+), 70 deletions(-)

diff --cc debian/changelog
index e687c81,c0a6771..6077717
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,31 @@@
+ sunflow (0.07.2.svn396+dfsg-13) unstable; urgency=medium
+ 
+   * Team upload.
+   * Build depend on libmagickcore-6.q16-2-extra instead of libmagickcore-extra
+     (Closes: #761550)
+   * Switch to debhelper level 9
+ 
+  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 15 Sep 2014 23:06:41 +0200
+ 
+ sunflow (0.07.2.svn396+dfsg-12) unstable; urgency=medium
+ 
+   * Move from collab-maint to pkg-java, "public" package.
+   * Bump Standards Version to 3.9.5 (no changes).
+ 
+  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Sun, 03 Aug 2014 01:58:03 +0200
+ 
+ sunflow (0.07.2.svn396+dfsg-11) unstable; urgency=medium
+ 
+   * Refresh 30_sweethome3d patch according to sweethome3d 4.4 (all changes).
+ 
+  -- Gabriele Giacone <1o5g4r8o at gmail.com>  Wed, 09 Jul 2014 14:41:38 +0200
+ 
 +sunflow (0.07.2.svn396+dfsg-10~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Gabriele Giacone <1o5g4r8o at gmail.com>  Tue, 18 Feb 2014 18:09:09 +0100
 +
  sunflow (0.07.2.svn396+dfsg-10) unstable; urgency=low
  
    * Refresh 30_sweethome3d patch according to sweethome3d 4.1 (all changes).

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-java/sunflow.git