This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 48232422aab6de0b13150e8cc54dfed737ecd89c Author: gregor herrmann <[email protected]> Date: Sun Jan 17 15:55:35 2010 +0000 Add HighlightFilter patch to work without HighlightFilter.java and rm src/java/net/sf/jabref/about/HighlightFilter.java --- debian/changelog | 4 +-- debian/copyright | 30 ++-------------------- debian/patches/08_HighlightFilter.patch | 45 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/repack.local | 1 + 5 files changed, 50 insertions(+), 31 deletions(-) diff --git a/debian/changelog b/debian/changelog index 47419e8..0ce7edf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,11 @@ jabref (2.6~beta2+dfsg-1) UNRELEASED; urgency=low - TODO: - - debian/copyright: OMG. some non-free - [ gregor herrmann ] * Move from contrib to main since all build and runtime dependencies are in main now (closes: #548180). Remove sun-java6-jre from Depends. * Repack upstream tarball to remove the sourceless pre-compiled libraries and some file without (free) licenses. + * Add HighlightFilter patch to work without HighlightFilter.java. * debian/rules: override dh_auto_clean, `ant clean' fails with an unpatched build.xml after removing lib/. Move ant from B-D to B-D-I since it's not used in the clean target anymore. diff --git a/debian/copyright b/debian/copyright index d6461a7..b808298 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,6 +6,8 @@ Disclaimer: The +dfsg version is created by removing - lib/: contains sourceless pre-compiled libraries - src/java/net/sf/jabref/util/DocumentPrinter.java: no license - src/help/de/JabRef-UserManual_de.tex: non-free license + - src/java/net/sf/jabref/about/HighlightFilter.java: license possibly + restricts field of endeavour Files: * Copyright: 2009, Morten Alver <[email protected]> @@ -176,34 +178,6 @@ License: includes no warranty. The author is not repsonsible for any loss of data or functionality or any adverse or unexpected effects of using this software. -Files: src/java/net/sf/jabref/about/HighlightFilter.java -Copyright: 1995-1997 Sun Microsystems, Inc. All Rights Reserved. -PROBLEM: non-free (field of endeavour, last paragraph) -License: - Sun grants you ("Licensee") a non-exclusive, royalty free, license to use, - modify and redistribute this software in source and binary code form, - provided that i) this copyright notice and license appear on all copies of - the software; and ii) Licensee does not utilize the software in a manner - which is disparaging to Sun. - . - This software 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 OR ITS DERIVATIVES. 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, EVEN IF SUN HAS BEEN ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - . - This software is not designed or intended for use in on-line control of - aircraft, air traffic, aircraft navigation or aircraft communications; or in - the design, construction, operation or maintenance of any nuclear - facility. Licensee represents and warrants that it will not use or - redistribute the Software for such purposes. - Files: src/osx/osxadapter/OSXAdapter.java Copyright: 2003, Apple Computer, Inc License: diff --git a/debian/patches/08_HighlightFilter.patch b/debian/patches/08_HighlightFilter.patch new file mode 100644 index 0000000..3005951 --- /dev/null +++ b/debian/patches/08_HighlightFilter.patch @@ -0,0 +1,45 @@ +Author: gregor herrmann <[email protected]> +Description: we remove src/java/net/sf/jabref/about/HighlightFilter.java for license reasons, + so we can't use it either ... +Debian-specific: yes + +--- a/src/java/net/sf/jabref/about/AboutPanel.java ++++ b/src/java/net/sf/jabref/about/AboutPanel.java +@@ -83,7 +83,6 @@ + + private AnimationListener aniListener ; + private ImageProducer iProducer ; +- private HighlightFilter filter ; + + AboutPanel() + { +@@ -99,10 +98,6 @@ + + image = new ImageIcon(getClass().getResource("/images/autumn.png")); + +- filter = new HighlightFilter(false, 5) ; +- filter.setMiddle(image.getIconWidth(), image.getIconHeight()); +- iProducer = new FilteredImageSource( image.getImage().getSource(), filter) ; +- + HEIGHT = image.getIconHeight() ; + WIDTH = image.getIconWidth() ; + +@@ -297,10 +292,6 @@ + else + { + image.paintIcon(this, g, 0, 0); +- if (filter.isReady()) +- { +- skipAnimation() ; +- } + } + } + // ---------------------------------------------------------------------------- +@@ -417,7 +408,6 @@ + sleepTime -= sleepTime / 3 ; + + image.setImage( createImage( iProducer) ); +- filter.nextStep(); + repaint(0, 0, WIDTH, HEIGHT) ; + } + } diff --git a/debian/patches/series b/debian/patches/series index 31aa14a..eca0255 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 05_antlr.patch 06_BibtexEntry.patch 07_PreviewPanel.patch +08_HighlightFilter.patch diff --git a/debian/repack.local b/debian/repack.local index 491491e..05f27c3 100644 --- a/debian/repack.local +++ b/debian/repack.local @@ -2,3 +2,4 @@ requires_version 2 rm lib rm src/java/net/sf/jabref/util/DocumentPrinter.java rm src/help/de/JabRef-UserManual_de.tex +rm src/java/net/sf/jabref/about/HighlightFilter.java -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
