The following commit has been merged in the master branch:
commit 0937d0193fa5c5fb42c230081c357c3fccfcf666
Author: Gabriele Giacone <1o5g4...@gmail.com>
Date: Wed Dec 21 13:00:51 2011 +0100
wrap'n'sort
diff --git a/debian/control b/debian/control
index f669c73..989d7b7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,15 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Gabriele Giacone <1o5g4...@gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), ant
-Build-Depends-Indep: openjdk-6-jdk | sun-java6-jdk, libjava3d-java,
imagemagick,
- libsunflow-java (>= 0.07.2.svn396+dfsg-9), java3ds-fileloader, libitext-java,
- libfreehep-graphicsio-svg-java, icedtea-netx
+Build-Depends: ant, debhelper (>= 7.0.50~)
+Build-Depends-Indep: icedtea-netx,
+ imagemagick,
+ java3ds-fileloader,
+ libfreehep-graphicsio-svg-java,
+ libitext-java,
+ libjava3d-java,
+ libsunflow-java (>= 0.07.2.svn396+dfsg-9),
+ openjdk-6-jdk | sun-java6-jdk
Standards-Version: 3.9.2
DM-Upload-Allowed: yes
Vcs-Git: git://git.debian.org/pkg-java/sweethome3d.git
@@ -15,9 +20,15 @@ Homepage: http://www.sweethome3d.com/
Package: sweethome3d
Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre, java-wrappers,
- libjava3d-java, libsunflow-java (>= 0.07.2.svn396+dfsg-9), java3ds-fileloader,
- libitext-java, libfreehep-graphicsio-svg-java, icedtea-netx
+Depends: icedtea-netx,
+ java-wrappers,
+ java3ds-fileloader,
+ libfreehep-graphicsio-svg-java,
+ libitext-java,
+ libjava3d-java,
+ libsunflow-java (>= 0.07.2.svn396+dfsg-9),
+ openjdk-6-jre | sun-java6-jre,
+ ${misc:Depends}
Description: Interior 2D design application with 3D preview
Sweet Home 3D is an interior design Java application for
quickly choosing and placing furniture on a house 2D plan
diff --git a/debian/copyright b/debian/copyright
index 3f01086..a1b5230 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Source: http://www.sweethome3d.com/
Copyright: 2006-2011, Emmanuel Puybaret, eTeks <i...@eteks.com>
License: GPL-2+
-On Debian systems the full text of the GNU General Public
+On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
@@ -15,6 +15,6 @@ License: Public domain
Files: debian/*
Copyright: 2011, Gabriele Giacone <1o5g4...@gmail.com>
License: GPL-2+
-On Debian systems the full text of the GNU General Public
+On Debian systems the full text of the GNU General Public
License can be found in the `/usr/share/common-licenses/GPL-2'
file.
diff --git a/debian/sweethome3d.install b/debian/sweethome3d.install
index 5f1c836..fa66d1a 100644
--- a/debian/sweethome3d.install
+++ b/debian/sweethome3d.install
@@ -7,4 +7,3 @@ debian/icons/22/sweethome3d.png
usr/share/icons/hicolor/22x22/apps
debian/icons/48/sweethome3d.png
usr/share/icons/hicolor/48x48/apps
debian/icons/128/sweethome3d.png usr/share/icons/hicolor/128x128/apps
debian/icons/sweethome3d.xpm usr/share/pixmaps
-
--
sweethome3d - Interior 2D design application with 3D preview
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
