[pkg-java] r8296 - trunk/substance/debian

Mon May 25 05:45:06 UTC 2009

Author: varun
Date: 2009-05-25 05:45:06 +0000 (Mon, 25 May 2009)
New Revision: 8296

Modified:
   trunk/substance/debian/changelog
   trunk/substance/debian/control
   trunk/substance/debian/copyright
   trunk/substance/debian/orig-tar.sh
Log:
* Update download link in orig-tar.sh
* debian/copyright:
  - upstream replaced quaqua images with free icons, so remove the
    artwork license which is no longer applicable
* Re-uploading to debian/main after fixing all the license issues
  pointed out by ftp-masters

Modified: trunk/substance/debian/changelog
===================================================================

--- trunk/substance/debian/changelog	2009-05-25 05:38:42 UTC (rev 8295)
+++ trunk/substance/debian/changelog	2009-05-25 05:45:06 UTC (rev 8296)
@@ -1,5 +1,6 @@
-substance (5.1-1) UNRELEASE; urgency=low
+substance (5.2-1) unstable; urgency=low
 
+  [ Damien Raude-Morvan ]
   * New upstream release.
   * debian/copyright:
     - MPL apply to XUI in src/contrib/net/xoetrope/editor/
@@ -7,8 +8,16 @@
   * debian/orig-tar.exclude:
     - exclude src/tools/docrobot/watermarks/*.jpg from orig tarballs
 
- -- Damien Raude-Morvan <drazzib at drazzib.com>  Sun, 19 Apr 2009 20:24:02 +0200
+  [ Varun Hiremath ]
+  * Update download link in orig-tar.sh
+  * debian/copyright:
+    - upstream replaced quaqua images with free icons, so remove the
+      artwork license which is no longer applicable
+  * Re-uploading to debian/main after fixing all the license issues
+    pointed out by ftp-masters
 
+ -- Varun Hiremath <varun at debian.org>  Mon, 25 May 2009 01:35:15 -0400
+
 substance (5.0-3) unstable; urgency=low
 
   * Change Depends: openjdk-6-jre.

Modified: trunk/substance/debian/control
===================================================================
--- trunk/substance/debian/control	2009-05-25 05:38:42 UTC (rev 8295)
+++ trunk/substance/debian/control	2009-05-25 05:45:06 UTC (rev 8296)
@@ -5,7 +5,7 @@
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
 Build-Depends: ant, cdbs, debhelper (>= 5), libasm2-java, liblaf-plugin-java,
  liblaf-widget-java, openjdk-6-jdk, libswingx-java, libjgoodies-forms-java, quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Homepage: https://substance.dev.java.net
 Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/substance
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/substance/debian/

Modified: trunk/substance/debian/copyright
===================================================================
--- trunk/substance/debian/copyright	2009-05-25 05:38:42 UTC (rev 8295)
+++ trunk/substance/debian/copyright	2009-05-25 05:45:06 UTC (rev 8296)
@@ -9,14 +9,10 @@
     Quaqua    : Werner Randelshofer
     
 Copyright: 
-    Substance : (c) 2005-2007 Kirill Grouchnikov and contributors
-    JGoodies  : (c) 2001-2006 Karsten Lentzsch and contributors
-    Quaqua    : (c) 1998-2006 Werner Randelshofer
+    Substance : © 2005-2007 Kirill Grouchnikov and contributors
+    JGoodies  : © 2001-2006 Karsten Lentzsch and contributors
+    Quaqua    : © 1998-2006 Werner Randelshofer
 
-Copyright (DefaultPalettes.java):
-    Apple Computer Inc., All rights reserved.
-    Microsoft Inc., All rights reserved.
-
 License:
     Substance and JGoodies (files in src/contrib/com/jgoodies/) are released under BSD license.
 
@@ -43,7 +39,7 @@
 (see files in src/contrib/ch/randelshofer/quaqua/)
 
 Copyright:
-    Quaqua Look And Feel (c) 2003-2006
+    Quaqua Look And Feel © 2003-2006
     
     Werner Randelshofer, Staldenmattweg 2, Immensee, CH-6405, Switzerland
     http://www.randelshofer.ch/
@@ -56,10 +52,10 @@
     
     Third Party Libraries
     
-        * NanoXML (c) 2000-2002
+        * NanoXML © 2000-2002
           Marc De Scheemaecker
           All Rights Reserved.
-        * Base64 (c)
+        * Base64 ©
           Robert Harder
         * Swing-Layout
           Sun Microsystems
@@ -140,7 +136,7 @@
     OSS (Open Source Software) compliant. It is not GPL or LGPL and 
     it will never be part of the GNU project.
     
-    Copyrighted (C) 2000-2002 Marc De Scheemaecker, All Rights Reserved
+    Copyrighted © 2000-2002 Marc De Scheemaecker, All Rights Reserved
     This software is provided 'as-is', without any express or implied 
     warranty. In no event will the authors be held liable for any damages 
     arising from the use of this software.
@@ -160,7 +156,7 @@
     
     Base64
     ------
-    Copyright (C) Robert Harder. All Rights reserved.
+    Copyright © Robert Harder. All Rights reserved.
     
     This software is in the public domain. Permission to use, copy, 
     modify, and distribute this software and its documentation for 
@@ -170,7 +166,7 @@
 
     JBrowser
     --------
-    Copyright (c) Steve Roy. All Rights reserved.
+    Copyright © Steve Roy. All Rights reserved.
     
     You can do whatever you like with it. As usual with this kind of 
     stuff, if you have success with it, great, if you manage to create 
@@ -179,7 +175,7 @@
 
     Swing-Layout
     ------------
-    Copyright (C) 2005 Sun Microsystems, Inc. All rights reserved. 
+    Copyright © 2005 Sun Microsystems, Inc. All rights reserved. 
     Use is subject to license terms.
     
     This program is free software; you can redistribute it and/or modify
@@ -196,12 +192,6 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     
-    Artwork
-    -------
-    The artwork used by the Quaqua Look and Feel is copyright 
-    Apple Computer Inc. Use of the artwork is only licensed for 
-    Apple hardware running an Apple operating system. 
-
 ------
 XUI:
 (see files in src/contrib/net/xoetrope/editor/)
@@ -414,7 +404,7 @@
           are reasonably necessary to implement that API, Contributor must
           also include this information in the LEGAL file.
 
-               (c)    Representations.
+          (c) Representations.
           Contributor represents that, except as disclosed pursuant to
           Section 3.4(a) above, Contributor believes that Contributor's
           Modifications are Contributor's original creation(s) and/or
@@ -685,6 +675,11 @@
 ------
 Tango Icons:
 
+    The original artwork used in the Quaqua color chooser implementation
+    has been replaced by images from Famfam Silk collection available
+    under Creative Commons Attribution-ShareAlike 2.5 license and
+    images created dynamically by the Substance core code.
+    
 Copyright: 2005-2009 Tango Desktop Project
 
 License:
@@ -697,5 +692,5 @@
     Attribution-ShareAlike 2.5.
 
 ------
-The Debian packaging is (C) 2007, Varun Hiremath <varunhiremath at gmail.com> and
+The Debian packaging is © 2007, Varun Hiremath <varunhiremath at gmail.com> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/substance/debian/orig-tar.sh
===================================================================
--- trunk/substance/debian/orig-tar.sh	2009-05-25 05:38:42 UTC (rev 8295)
+++ trunk/substance/debian/orig-tar.sh	2009-05-25 05:45:06 UTC (rev 8296)
@@ -5,7 +5,7 @@
 ZIP=substance-all.zip
 DIR=substance-$1.orig
 
-wget https://substance.dev.java.net/files/documents/3294/93901/$ZIP
+wget https://substance.dev.java.net/files/documents/3294/127670/$ZIP
 
 # clean up the upstream tarball
 unzip -d $DIR $ZIP
@@ -18,5 +18,3 @@
   mv $TAR $origDir
   echo "moved $TAR to $origDir"
 fi
-
-exit 0


