[Debian-med-packaging] [SCM] igv branch, master, updated. upstream/1.4.2-6-g3dc8fb8

Fri Jun 18 23:57:09 UTC 2010

The following commit has been merged in the master branch:
commit 3dc8fb8bb89475f77779475bbabf8fd0e6a0cf48
Author: Shaun Jackman <sjackman at debian.org>
Date:   Fri Jun 18 16:53:33 2010 -0700

    * src/toolbarButtonGraphics/general/Information16.gif:
    Extract from jlfgr-1_0.jar.
    * src/toolbarButtonGraphics/general/Refresh24.gif: Ditto.
    * src/toolbarButtonGraphics/general/ZoomIn24.gif: Ditto.
    * src/toolbarButtonGraphics/general/ZoomOut24.gif: Ditto.
    * src/toolbarButtonGraphics/navigation/Home24.gif: Ditto.
    * debian/source/include-binaries: Add these files.
    * debian/copyright: Add license for jlfgr.
    * build.xml (jars): Remove jlfgr-1_0.jar.

diff --git a/debian/copyright b/debian/copyright
index 91d6df6..4eb1172 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,49 @@ Copyright: 2001, 2002 Dipl. Ing. P. Szawlowski
 License: LGPL-2.1
  See `/usr/share/common-licenses/LGPL-2.1'.
 
+Files: src/toolbarButtonGraphics/*
+Copyright: 2000 by Sun Microsystems, Inc.
+License: other
+ Sun grants you ("Licensee") a non-exclusive,
+ royalty free, license to use, and redistribute
+ this software graphics artwork, as individual
+ graphics or as a collection, as part of software
+ code or programs that you develop, provided that
+ i) this copyright notice and license accompany
+ the software graphics artwork; and ii) you do not
+ utilize the software graphics artwork in a manner
+ which is disparaging to Sun. Unless enforcement
+ is prohibited by applicable law, you may not
+ modify the graphics, and must use them true to
+ color and unmodified in every way.
+ .
+ This software graphics artwork is provided "AS
+ IS," without a warranty of any kind. ALL EXPRESS
+ OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+ WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN AND
+ ITS LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES
+ SUFFERED BY LICENSEE AS A RESULT OF USING,
+ MODIFYING OR DISTRIBUTING THE SOFTWARE GRAPHICS
+ ARTWORK.
+ .
+ IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE
+ FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
+ DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
+ INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
+ AND REGARDLESS OF THE THEORY OF LIABILITY,
+ ARISING OUT OF THE USE OF OR INABILITY TO USE
+ SOFTWARE GRAPHICS ARTWORK, EVEN IF SUN HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ If any of the above provisions are held to be in
+ violation of applicable law, void, or
+ unenforceable in any jurisdiction, then such
+ provisions are waived to the extent necessary for
+ this Disclaimer to be otherwise enforceable in
+ such jurisdiction.
+
 Files: debian/*
 Copyright: 2010 Shaun Jackman <sjackman at debian.org>
 License: ISC
diff --git a/debian/patches/debian-changes-1.4.2-1 b/debian/patches/debian-changes-1.4.2-1
index d176a3f..3c7081d 100644
--- a/debian/patches/debian-changes-1.4.2-1
+++ b/debian/patches/debian-changes-1.4.2-1
@@ -34,7 +34,7 @@ Last-Update: <YYYY-MM-DD>
  
      <!-- Platform specific input files -->
      <property name="native.dir"        value="${basedir}/native/" />
-@@ -54,27 +54,24 @@
+@@ -54,27 +54,23 @@
          <!-- Create class path for manifest -->
          <path id="@jars">
              <pathelement path="${lib.dir}AbsoluteLayout.jar" />
@@ -55,8 +55,8 @@ Last-Update: <YYYY-MM-DD>
              <pathelement path="${lib.dir}jide-dock.jar" />
              <pathelement path="${lib.dir}jide-grids.jar" />
 -            <pathelement path="${lib.dir}junit-4.5.jar" />
+-            <pathelement path="${lib.dir}jlfgr-1_0.jar" />
 +            <pathelement path="${lib.dir}junit4.jar" />
-             <pathelement path="${lib.dir}jlfgr-1_0.jar" />
              <pathelement path="${lib.dir}ledatastream.jar" />
 -            <pathelement path="${lib.dir}log4j-1.2.15.jar" />
 -            <pathelement path="${lib.dir}maf.jar" />
@@ -68,7 +68,7 @@ Last-Update: <YYYY-MM-DD>
          </path>
  
          <pathconvert property="class-path" pathsep=" " dirsep="/" refid="@jars">
-@@ -105,7 +102,7 @@
+@@ -105,7 +101,7 @@
      </target>
  
      <target name="compile" depends="init">
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..4dc2375
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,5 @@
+src/toolbarButtonGraphics/general/Information16.gif
+src/toolbarButtonGraphics/general/Refresh24.gif
+src/toolbarButtonGraphics/general/ZoomIn24.gif
+src/toolbarButtonGraphics/general/ZoomOut24.gif
+src/toolbarButtonGraphics/navigation/Home24.gif
diff --git a/src/toolbarButtonGraphics/general/Information16.gif b/src/toolbarButtonGraphics/general/Information16.gif
new file mode 100644
index 0000000..5748e32
Binary files /dev/null and b/src/toolbarButtonGraphics/general/Information16.gif differ
diff --git a/src/toolbarButtonGraphics/general/Refresh24.gif b/src/toolbarButtonGraphics/general/Refresh24.gif
new file mode 100644
index 0000000..577c462
Binary files /dev/null and b/src/toolbarButtonGraphics/general/Refresh24.gif differ
diff --git a/src/toolbarButtonGraphics/general/ZoomIn24.gif b/src/toolbarButtonGraphics/general/ZoomIn24.gif
new file mode 100644
index 0000000..dbd4477
Binary files /dev/null and b/src/toolbarButtonGraphics/general/ZoomIn24.gif differ
diff --git a/src/toolbarButtonGraphics/general/ZoomOut24.gif b/src/toolbarButtonGraphics/general/ZoomOut24.gif
new file mode 100644
index 0000000..259bf9c
Binary files /dev/null and b/src/toolbarButtonGraphics/general/ZoomOut24.gif differ
diff --git a/src/toolbarButtonGraphics/navigation/Home24.gif b/src/toolbarButtonGraphics/navigation/Home24.gif
new file mode 100644
index 0000000..a25dee2
Binary files /dev/null and b/src/toolbarButtonGraphics/navigation/Home24.gif differ

-- 
Integrative Genomics Viewer

