This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 95d9df7b3cacdd0e81b4938086d3ebf34569befe Author: gregor herrmann <[email protected]> Date: Mon Mar 8 16:49:24 2010 +0000 remove patches 07_PreviewPanel.patch and 08_HighlightFilter.patch, applied upstream --- debian/changelog | 2 ++ debian/patches/07_PreviewPanel.patch | 46 --------------------------------- debian/patches/08_HighlightFilter.patch | 45 -------------------------------- debian/patches/series | 2 -- 4 files changed, 2 insertions(+), 93 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f6992e..7d06f8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ jabref (2.6~beta3+dfsg-1) UNRELEASED; urgency=low - debian/repack.local: don't remove the three "offending" files, two were revomed upstream, the third was re-licensed - adjust debian/copyright accordingly + - remove patches 07_PreviewPanel.patch and 08_HighlightFilter.patch, + applied upstream -- gregor herrmann <[email protected]> Mon, 08 Mar 2010 17:31:33 +0100 diff --git a/debian/patches/07_PreviewPanel.patch b/debian/patches/07_PreviewPanel.patch deleted file mode 100644 index 4c7255d..0000000 --- a/debian/patches/07_PreviewPanel.patch +++ /dev/null @@ -1,46 +0,0 @@ -Author: tony mancill <[email protected]> -Description: remove dependency on DocumentPrinter.java (requires Java 1.5 or later) ---- a/src/java/net/sf/jabref/PreviewPanel.java -+++ b/src/java/net/sf/jabref/PreviewPanel.java -@@ -9,6 +9,9 @@ - import java.io.IOException; - import java.io.StringReader; - -+import javax.print.attribute.HashPrintRequestAttributeSet; -+import javax.print.attribute.PrintRequestAttributeSet; -+import javax.print.attribute.standard.JobName; - import javax.swing.*; - import javax.swing.event.HyperlinkEvent; - import javax.swing.event.HyperlinkListener; -@@ -16,7 +19,6 @@ - import net.sf.jabref.export.layout.Layout; - import net.sf.jabref.export.layout.LayoutHelper; - import net.sf.jabref.export.ExportFormats; --import net.sf.jabref.util.DocumentPrinter; - - /** - * Displays an BibtexEntry using the given layout format. -@@ -116,17 +118,18 @@ - putValue(SHORT_DESCRIPTION, Globals.lang("Print Preview")); - } - -- DocumentPrinter printerService; -+ //DocumentPrinter printerService; - - public void actionPerformed(ActionEvent arg0) { -- if (printerService == null) -- printerService = new DocumentPrinter(); -- -+ - // Background this, as it takes a while. - new Thread() { - public void run() { - try { -- printerService.print(entry.getCiteKey(), previewPane); -+ PrintRequestAttributeSet pras = new HashPrintRequestAttributeSet(); -+ pras.add(new JobName(entry.getCiteKey(), null)); -+ previewPane.print(null, null, true, null, pras, false); -+ - } catch (PrinterException e) { - - // Inform the user... we don't know what to do. diff --git a/debian/patches/08_HighlightFilter.patch b/debian/patches/08_HighlightFilter.patch deleted file mode 100644 index 3005951..0000000 --- a/debian/patches/08_HighlightFilter.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 eca0255..69a2066 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,3 @@ 03_external_apps.patch 05_antlr.patch 06_BibtexEntry.patch -07_PreviewPanel.patch -08_HighlightFilter.patch -- 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
