Author: gerardo-guest Date: 2006-09-24 18:40:53 +0000 (Sun, 24 Sep 2006) New Revision: 2485
Added: trunk/rssowl/ trunk/rssowl/debian/ trunk/rssowl/debian/changelog trunk/rssowl/debian/compat trunk/rssowl/debian/control trunk/rssowl/debian/copyright trunk/rssowl/debian/docs trunk/rssowl/debian/menu trunk/rssowl/debian/patches/ trunk/rssowl/debian/patches/01_browser.patch trunk/rssowl/debian/patches/02_build0.patch trunk/rssowl/debian/patches/03_build1.patch trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch trunk/rssowl/debian/patches/05_swt31.patch trunk/rssowl/debian/patches/06_use-jce.patch trunk/rssowl/debian/rssowl.1 trunk/rssowl/debian/rssowl.desktop trunk/rssowl/debian/rssowl.install trunk/rssowl/debian/rssowl.manpages trunk/rssowl/debian/rssowl.sh trunk/rssowl/debian/rules Log: Initial Import Added: trunk/rssowl/debian/changelog =================================================================== --- trunk/rssowl/debian/changelog (rev 0) +++ trunk/rssowl/debian/changelog 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,8 @@ +rssowl (1.2.2-1) unstable; urgency=low + + * Initial release Closes: #346541 + * Added manpage + * Patches and rssowl.sh script were taken from the fedora rssowl source package + + -- Gerardo Curiel <[EMAIL PROTECTED]> Thu, 24 Sep 2006 17:54:22 -0400 + Property changes on: trunk/rssowl/debian/changelog ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/compat =================================================================== --- trunk/rssowl/debian/compat (rev 0) +++ trunk/rssowl/debian/compat 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1 @@ +4 Property changes on: trunk/rssowl/debian/compat ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/control =================================================================== --- trunk/rssowl/debian/control (rev 0) +++ trunk/rssowl/debian/control 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,22 @@ +Source: rssowl +Section: net +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Gerardo Curiel <[EMAIL PROTECTED]> +Build-Depends: cdbs, debhelper (>= 5.0.34), ant, java-gcj-compat-dev, libitext-java, eclipse-platform, libcommons-logging-java, libjdom1-java, libcommons-httpclient-java, libcommons-codec-java +Standards-Version: 3.7.0 + +Package: rssowl +Architecture: all +Depends: java-gcj-compat, libgconf-java, libitext-java, eclipse-platform, libcommons-logging-java, libjdom1-java, libcommons-httpclient-java, libcommons-codec-java +Description: A RSS / RDF / Atom Newsreader written in Java using SWT + RSSOwl is a application that lets you gather, organize, update, + and store information from any compliant source in a convenient, + easy to use interface, save selected information in various formats + for offline viewing and sharing, and much more. + . + Read News in a tabfolder, save favorites in categories, Export to PDF, + RTF,HTML,OPML, Import Feeds from OPML, perform fulltext-search, use the + integrated browser. + . + Homepage: http://www.rssowl.org Property changes on: trunk/rssowl/debian/control ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/copyright =================================================================== --- trunk/rssowl/debian/copyright (rev 0) +++ trunk/rssowl/debian/copyright 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,68 @@ +This package was debianized by Gerardo Curiel <[EMAIL PROTECTED]> on +Thu, 5 Jan 2006 17:54:22 -0400. + +It was downloaded from http://www.rssowl.org + +Copyright Holder: +RSSOwl development team: + +Benjamin Pasero (Developer / Project Admin and Manager) +Garry Forbes (Doc Writer / Tutorial) +Christophe Dumez Translator (I18N) +Geon Goo (I18N) +Marcelo B. (I18N) +Merlin Ran (I18N) +Tobias Eichert (Web Designer) +Kay Patzwald (Packager) +Dane W. Smith (Promoter) + + +License: + +------------------------------------------------------ + The RSSOwl license. + Copyright (c) 2003-2006 RSSOwl Development Team + Document version 1.2, 02-23-2005 +------------------------------------------------------ + +RSSOwl Software User Agreement +------------------------------ + +RSSOWL.ORG MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS +FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE +TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS +OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF +THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE +LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS +AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS +OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT. + +The RSSOwl project is free software under the terms of the Common Public License Version 1.0. +A copy of the CPL is available at http://www.rssowl.org/legal/cpl-v10.html + +RSSOwl is built upon other free libraries. These libraries may have come with RSSOwl in the "/lib" +directory or are packaged inside "rssowl.jar". +These libraries are not distributed under the terms of the CPL, but rather some other free, compatible +license. Specifically: + + - JDom: JDom License (http://www.rssowl.org/legal/jdom.license) + - Apache Xerces: Apache Software License ver. 1.1 (http://www.opensource.org/licenses/apachepl.php) + - BlowfishJ: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php) + - iText: Mozilla Public License Version 1.1 (http://www.mozilla.org/MPL/MPL-1.1.html) + - Apache Jakarta Commons Codec: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php) + - Apache Jakarta Commons Logging: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php) + - Apache Jakarta Commons HTTPClient: Apache Software License ver. 2.0 (http://www.opensource.org/licenses/apache2.0.php) + +RSSOwl is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied waranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +The developer is not responsible for any damages that an abuse of RSSOwl will produce. + +Content may contain encryption software. The country in which you are currently may have restrictions +on the import, possession, and use, and/or re-export to another country, of encryption software. +BEFORE using any encryption software, please check the country's laws, regulations and policies concerning +the import, possession, or use, and re-export of encryption software, to see if this is permitted. + +IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT + +- The RSSOwl Development Team - + Property changes on: trunk/rssowl/debian/copyright ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/docs =================================================================== --- trunk/rssowl/debian/docs (rev 0) +++ trunk/rssowl/debian/docs 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,5 @@ +README.txt +doc/faq.html +usr/CPL.txt +doc/mpl-v11.txt +doc/tutorial/ Property changes on: trunk/rssowl/debian/docs ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/menu =================================================================== --- trunk/rssowl/debian/menu (rev 0) +++ trunk/rssowl/debian/menu 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,2 @@ +?package(rssowl):needs="X11" section="Apps/Net"\ + title="rssowl" command="/usr/bin/rssowl" icon="/usr/share/pixmaps/rssowl.xpm" Property changes on: trunk/rssowl/debian/menu ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/patches/01_browser.patch =================================================================== --- trunk/rssowl/debian/patches/01_browser.patch (rev 0) +++ trunk/rssowl/debian/patches/01_browser.patch 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,57 @@ +--- src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java.orig 2006-04-23 05:30:40.000000000 -0700 ++++ src/java/net/sourceforge/rssowl/util/shop/BrowserShop.java 2006-05-06 09:54:29.000000000 -0700 +@@ -36,6 +36,9 @@ + import org.eclipse.swt.SWTError; + import org.eclipse.swt.program.Program; + ++import org.gnu.gconf.ConfClient; ++import org.gnu.gconf.ConfException; ++ + import java.io.IOException; + + /** +@@ -268,14 +271,31 @@ + /** Try Netscape as default browser */ + if (webBrowser == null) { + try { +- webBrowser = "netscape"; +- p = Runtime.getRuntime().exec(webBrowser + " " + href); +- } catch (IOException e) { +- webBrowser = "mozilla"; ++ // This is kind of lame, but - oh well - it's slightly better than ++ // the original. ++ ConfClient client = ConfClient.getInstance(); ++ webBrowser = client.getString ("/desktop/gnome/url-handlers/http/command"); ++ if (webBrowser.startsWith("firefox")) ++ webBrowser = "firefox"; ++ else if (webBrowser.startsWith("mozilla")) ++ webBrowser = "mozilla"; ++ else if (webBrowser.startsWith("epiphany")) ++ webBrowser = "epiphany"; ++ if (webBrowser.startsWith("netscape")) ++ webBrowser = "netscape"; ++ else ++ webBrowser = "firefox"; ++ } catch (ConfException ce) { ++ try { ++ webBrowser = "firefox"; ++ p = Runtime.getRuntime().exec(webBrowser + " " + href); ++ } catch (IOException e) { ++ p = null; ++ webBrowser = "mozilla"; ++ } + } + } + +- /** Try Mozilla as default browser */ + if (p == null) { + try { + p = Runtime.getRuntime().exec(webBrowser + " " + href); +@@ -284,6 +304,7 @@ + errorMessage(); + } + } ++ + return p; + } + Property changes on: trunk/rssowl/debian/patches/01_browser.patch ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/patches/02_build0.patch =================================================================== --- trunk/rssowl/debian/patches/02_build0.patch (rev 0) +++ trunk/rssowl/debian/patches/02_build0.patch 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,16 @@ +--- src/build.xml.orig 2006-04-23 05:30:41.000000000 -0700 ++++ src/build.xml 2006-05-06 09:34:24.000000000 -0700 +@@ -121,7 +121,12 @@ + for the special-chars of the translations. + --> + <target name="compile_linux" depends="init"> +- <javac excludes="**/DevShop.java" encoding="utf8" destdir="${classes}/" srcdir="${src}" classpath="${libs}" /> ++ <path id="libs.classpath"> ++ <fileset dir="${root}/lib" includes="**/*.jar" /> ++ </path> ++ <javac excludes="**/DevShop.java" encoding="utf8" destdir="${classes}/" srcdir="${src}"> ++ <classpath refid="libs.classpath" /> ++ </javac> + </target> + + <!-- Property changes on: trunk/rssowl/debian/patches/02_build0.patch ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/patches/03_build1.patch =================================================================== --- trunk/rssowl/debian/patches/03_build1.patch (rev 0) +++ trunk/rssowl/debian/patches/03_build1.patch 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,21 @@ +--- src/build.xml.orig 2006-05-06 09:45:03.000000000 -0700 ++++ src/build.xml 2006-05-06 09:46:34.000000000 -0700 +@@ -182,18 +182,7 @@ + Pack compiled RSSOwl into executable JAR file. + --> + <target name="jar_linux" depends="compile_linux"> +- <unjar src="${SWT}" dest="${classes}" /> +- <unjar src="${SWT-NL}" dest="${classes}" /> +- <unjar src="${JDOM}" dest="${classes}" /> +- <unjar src="${JFACE}" dest="${classes}" /> +- <unjar src="${FORMS}" dest="${classes}" /> +- <unjar src="${XERCES}" dest="${classes}" /> +- <unjar src="${ITEXT}" dest="${classes}" /> + <unjar src="${ITEXTASIAN}" dest="${classes}" /> +- <unjar src="${CODEC}" dest="${classes}" /> +- <unjar src="${HTTPCLIENT}" dest="${classes}" /> +- <unjar src="${LOGGING}" dest="${classes}" /> +- <unjar src="${BLOWFISH}" dest="${classes}" /> + <delete file="${classes}/META-INF/LICENSE.txt" /> + <delete file="${classes}/META-INF/info.xml" /> + <jar jarfile="${deploy}/rssowl.jar" basedir="${classes}"> Property changes on: trunk/rssowl/debian/patches/03_build1.patch ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch =================================================================== --- trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch (rev 0) +++ trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,169 @@ +--- src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java.orig 2006-04-23 05:30:41.000000000 -0700 ++++ src/java/net/sourceforge/rssowl/controller/sort/SortingSelectionAdapter.java 2006-05-06 09:42:26.000000000 -0700 +@@ -26,7 +26,6 @@ + + import net.sourceforge.rssowl.controller.NewsTable; + +-import org.eclipse.swt.SWT; + import org.eclipse.swt.events.SelectionAdapter; + import org.eclipse.swt.events.SelectionEvent; + import org.eclipse.swt.widgets.Table; +@@ -42,7 +41,7 @@ + * header is clicked and update it. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Ludovic Kim-Xuan Galibert </a> +- * @version 1.2.1 ++ * @version 1.1.3 + */ + public class SortingSelectionAdapter extends SelectionAdapter { + +@@ -101,59 +100,67 @@ + } + + /** +- * Sort the News using a Sorter that is identified by the given field value. ++ * Handle the sorting corresponding to the header clicked + * +- * @param field The identifier of the Sorter to use. +- * @return boolean TRUE if the sort was ascending, FALSE if descending. ++ * @param se the SelectionEvent + */ +- public boolean sort(String field) { ++ public void widgetSelected(SelectionEvent se) { ++ widgetSelected((TableColumn) se.getSource()); ++ } ++ ++ /** ++ * Handle the sorting corresponding to the header clicked ++ * ++ * @param tc The selected TableColumn ++ */ ++ public void widgetSelected(TableColumn tc) { + Comparator sorter = null; + boolean ascending = true; + + /** Sort by news title */ +- if ("TABLE_HEADER_NEWSTITLE".equals(field)) { ++ if (tc.getData().equals("TABLE_HEADER_NEWSTITLE")) { + ascending = this.titleAscending; + this.titleAscending = !this.titleAscending; + sorter = new TitleSorter(); + } + + /** Sort by publish date */ +- else if ("TABLE_HEADER_PUBDATE".equals(field)) { ++ else if (tc.getData().equals("TABLE_HEADER_PUBDATE")) { + ascending = this.pudDateAscending; + this.pudDateAscending = !this.pudDateAscending; + sorter = new PubDateSorter(newsItems); + } + + /** Sort by author */ +- else if ("TABLE_HEADER_AUTHOR".equals(field)) { ++ else if (tc.getData().equals("TABLE_HEADER_AUTHOR")) { + ascending = this.authorAscending; + this.authorAscending = !this.authorAscending; + sorter = new AuthorSorter(newsItems); + } + + /** Sort by category */ +- else if ("TABLE_HEADER_CATEGORY".equals(field)) { ++ else if (tc.getData().equals("TABLE_HEADER_CATEGORY")) { + ascending = this.categoryAscending; + this.categoryAscending = !this.categoryAscending; + sorter = new CategorySorter(newsItems); + } + + /** Sort by publisher */ +- else if ("TABLE_HEADER_PUBLISHER".equals(field)) { ++ else if (tc.getData().equals("TABLE_HEADER_PUBLISHER")) { + ascending = this.publisherAscending; + this.publisherAscending = !this.publisherAscending; + sorter = new PublisherSorter(newsItems); + } + + /** Sort by news feed */ +- else if ("TABLE_HEADER_FEED".equals(field)) { ++ else if (tc.getData().equals("TABLE_HEADER_FEED")) { + ascending = this.newsfeedAscending; + this.newsfeedAscending = !this.newsfeedAscending; + sorter = new NewsFeedSorter(newsItems); + } + + /** Sort by news status */ +- else if ("TABLE_HEADER_STATUS".equals(field)) { ++ else if (tc.getData().equals("TABLE_HEADER_STATUS")) { + ascending = this.statusAscending; + this.statusAscending = !this.statusAscending; + sorter = new StatusSorter(newsItems); +@@ -169,28 +176,6 @@ + if (!ascending) + Collections.reverse(newsItemOrder); + +- return ascending; +- } +- +- /** +- * Handle the sorting corresponding to the header clicked +- * +- * @param se the SelectionEvent +- */ +- public void widgetSelected(SelectionEvent se) { +- widgetSelected((TableColumn) se.getSource()); +- } +- +- /** +- * Handle the sorting corresponding to the header clicked +- * +- * @param tc The selected TableColumn +- */ +- public void widgetSelected(TableColumn tc) { +- +- /** Sort based on the given TableColumn */ +- boolean ascending = sort((String) tc.getData()); +- + /** Remember the width values of the columns */ + int columnCount = table.getColumnCount(); + int columnWidth[] = new int[columnCount]; +@@ -202,41 +187,6 @@ + if (table.getSelectionCount() > 0) + selectedNews = table.getSelection()[0].getText(1); + +- /** Show a Sort Indicator inside the selected TableColumn */ +- if (!tc.getData().equals("TABLE_HEADER_STATUS")) { +- table.setSortColumn(tc); +- +- /** Reset Sort Direction */ +- if (table.getSortDirection() != SWT.NONE) +- table.setSortDirection(SWT.NONE); +- +- /** Apply the new direction */ +- table.setSortDirection(ascending ? SWT.DOWN : SWT.UP); +- +- /** +- * The Indicator requires some space, so pack the TableColumn. In order to +- * avoid flashing, first set the Table to redraw = false before packing. +- */ +- table.setRedraw(false); +- tc.pack(); +- table.setRedraw(true); +- +- /** Restore Focus if necessary */ +- if (!table.isFocusControl()) +- table.setFocus(); +- +- /** Grant the sorted Column its preferred Width */ +- int sortColumnIndex = table.indexOf(tc); +- if (columnWidth[sortColumnIndex] < tc.getWidth()) +- columnWidth[sortColumnIndex] = tc.getWidth(); +- } +- +- /** Do not show the Indicator in the first, narrow Column */ +- else if (table.getSortColumn() != null) { +- table.setSortDirection(SWT.NONE); +- table.setSortColumn(null); +- } +- + /** Remove All tableitems */ + table.removeAll(); + Property changes on: trunk/rssowl/debian/patches/04_swt31-SortingSelectionAdapter.patch ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/patches/05_swt31.patch =================================================================== --- trunk/rssowl/debian/patches/05_swt31.patch (rev 0) +++ trunk/rssowl/debian/patches/05_swt31.patch 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,135 @@ +--- src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java~ 2006-01-04 06:01:14.000000000 -0800 ++++ src/java/net/sourceforge/rssowl/controller/panel/NewsfeedPanel.java 2005-07-15 16:44:50.000000000 -0700 +@@ -54,7 +54,6 @@ + import org.eclipse.swt.widgets.ToolBar; + import org.eclipse.swt.widgets.ToolItem; + +-import java.util.ArrayList; + import java.util.Hashtable; + import java.util.Vector; + +@@ -63,7 +62,7 @@ + * Table. A selection on a newstitle will open it inside the Newstext panel. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Benjamin Pasero </a> +- * @version 1.2.1 ++ * @version 1.1.3 + */ + public class NewsfeedPanel { + private int[] columnWidths; +@@ -150,15 +149,15 @@ + MenuItem generateRTF = new MenuItem(labelMenu, SWT.NONE); + generateRTF.setText(GUI.i18n.getTranslation("MENU_GENERATE_RTF_SELECTION") + "..."); + generateRTF.setEnabled(false); +- } + +- /** Not enabled */ +- MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE); +- generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "..."); +- generateHTML.setEnabled(false); ++ /** Not enabled */ ++ MenuItem generateHTML = new MenuItem(labelMenu, SWT.NONE); ++ generateHTML.setText(GUI.i18n.getTranslation("MENU_GENERATE_HTML_SELECTION") + "..."); ++ generateHTML.setEnabled(false); + +- /** Separator */ +- new MenuItem(labelMenu, SWT.SEPARATOR); ++ /** Separator */ ++ new MenuItem(labelMenu, SWT.SEPARATOR); ++ } + + /** Not enabled */ + MenuItem markUnreadItem = new MenuItem(labelMenu, SWT.NONE); +@@ -262,15 +261,9 @@ + + /** Container for the left header */ + Composite infoViewFormHeaderLeft = new Composite(infoViewForm, SWT.NONE); +- infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(2, 5, 0, 5, 6, false)); ++ infoViewFormHeaderLeft.setLayout(LayoutShop.createGridLayout(1, 5, 0)); + infoViewFormHeaderLeft.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE)); + +- /** Info Icon */ +- Label infoIcon = new Label(infoViewFormHeaderLeft, SWT.NONE); +- infoIcon.setImage(PaintShop.iconInfo); +- infoIcon.setBackground(GUI.display.getSystemColor(SWT.COLOR_WHITE)); +- infoIcon.setLayoutData(new GridData(SWT.BEGINNING, SWT.CENTER, false, true)); +- + /** Info Label */ + Label infoLabel = new Label(infoViewFormHeaderLeft, SWT.WRAP); + infoLabel.setFont(FontShop.textFont); +@@ -361,9 +354,17 @@ + /** Create the Table Columns */ + NewsTable.fillTableColumns(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch); + ++ /** Fill table with news - Use the existing column widhts */ ++ if (columnWidths != null && columnWidths.length == newsItemInfos.size()) ++ NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths); ++ ++ /** Fill table with news - Pack the table columns */ ++ else ++ NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch); ++ + /** Auto-Sort table if the settings tell so */ + if (GlobalSettings.autoSortNews) { +- ArrayList sortOrder = GlobalSettings.sortOrder; ++ java.util.ArrayList sortOrder = GlobalSettings.sortOrder; + TableData tableData = (TableData) newsTable.getData(); + + /** Go through sortOrder from beginning to end */ +@@ -372,35 +373,12 @@ + + /** Sort Column if sortOrderItem is available */ + if (tableData.hasColumnSorter(sortOrderItem)) { +- +- /** Sort based on the given TableColumn */ +- boolean ascending = tableData.getColumnSorter(sortOrderItem).sort(sortOrderItem); +- +- /** Show a Sort Indicator inside the selected TableColumn */ +- if (!"TABLE_HEADER_STATUS".equals(sortOrderItem)) { +- newsTable.setSortColumn(tableData.getColumn(sortOrderItem)); +- newsTable.setSortDirection(ascending ? SWT.DOWN : SWT.UP); +- } +- +- /** Do not show the Indicator in the first, narrow Column */ +- else if (newsTable.getSortColumn() != null) { +- newsTable.setSortDirection(SWT.NONE); +- newsTable.setSortColumn(null); +- } +- ++ tableData.getColumnSorter(sortOrderItem).widgetSelected(tableData.getColumn(sortOrderItem)); + break; + } + } + } + +- /** Fill table with news - Use the existing column widhts */ +- if (columnWidths != null && columnWidths.length == newsItemInfos.size()) +- NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch, columnWidths); +- +- /** Fill table with news - Pack the table columns */ +- else +- NewsTable.fillTable(newsTable, newsItems, newsItemOrder, newsItemInfos, performSearch); +- + /** Restore last selected news if available */ + if (selectedNews != null) { + for (int a = 0; a < newsTable.getItemCount(); a++) +@@ -411,7 +389,7 @@ + } + } + +- /** No news are there to display */ ++ /** No news are there to GUI.display */ + else { + + /** Save some data in TabItem */ +--- src/java/net/sourceforge/rssowl/controller/NewsTable.java~ 2005-11-06 08:06:57.000000000 -0800 ++++ src/java/net/sourceforge/rssowl/controller/NewsTable.java 2006-01-04 06:08:15.000000000 -0800 +@@ -266,7 +266,7 @@ + /** Status Column is not resizable and has a ToolTip */ + if (isStatus) { + column.setResizable(false); +- column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a])); ++ // column.setToolTipText(GUI.i18n.getTranslation(columnOrder[a])); + } + + /** Apply sorting selection adapter */ Property changes on: trunk/rssowl/debian/patches/05_swt31.patch ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/patches/06_use-jce.patch =================================================================== --- trunk/rssowl/debian/patches/06_use-jce.patch (rev 0) +++ trunk/rssowl/debian/patches/06_use-jce.patch 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,77 @@ +--- src/java/net/sourceforge/rssowl/util/CryptoManager.java.orig 2006-04-23 05:30:41.000000000 -0700 ++++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-05-06 09:27:30.000000000 -0700 +@@ -24,7 +24,9 @@ + + package net.sourceforge.rssowl.util; + +-import net.sourceforge.blowfishj.BlowfishEasy; ++import javax.crypto.*; ++import javax.crypto.spec.*; ++ + import net.sourceforge.rssowl.controller.GUI; + import net.sourceforge.rssowl.util.shop.StringShop; + +@@ -56,15 +58,28 @@ + /** An instance of the CryptoManager */ + private static CryptoManager instance; + +- private BlowfishEasy blowFish; ++ private Cipher bfe; ++ private Cipher bfd; ++ + private Hashtable crypta; + + /** + * Called from the static factory Method + */ + private CryptoManager() { +- blowFish = new BlowfishEasy(new char[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 }); +- loadData(); ++ try ++ { ++ bfe = Cipher.getInstance("Blowfish/ECB/PKCS7"); ++ bfd = Cipher.getInstance("Blowfish/ECB/PKCS7"); ++ SecretKeySpec skeyspec = new SecretKeySpec (new byte[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 }, ++ "Blowfish"); ++ bfe.init(Cipher.ENCRYPT_MODE, skeyspec); ++ bfd.init(Cipher.DECRYPT_MODE, skeyspec); ++ loadData(); ++ } ++ catch (Exception _) ++ { ++ } + } + + /** +@@ -176,9 +191,12 @@ + */ + private void decryptData() { + Enumeration keys = crypta.keys(); +- while (keys.hasMoreElements()) { +- String key = (String) keys.nextElement(); +- crypta.put(key, blowFish.decryptString((String) crypta.get(key))); ++ try { ++ while (keys.hasMoreElements()) { ++ String key = (String) keys.nextElement(); ++ crypta.put(key, new String (bfd.doFinal((byte[]) crypta.get(key)))); ++ } ++ } catch (Exception _) { + } + } + +@@ -187,9 +205,12 @@ + */ + private void encryptData() { + Enumeration keys = crypta.keys(); +- while (keys.hasMoreElements()) { +- String key = (String) keys.nextElement(); +- crypta.put(key, blowFish.encryptString((String) crypta.get(key))); ++ try { ++ while (keys.hasMoreElements()) { ++ String key = (String) keys.nextElement(); ++ crypta.put(key, bfe.doFinal(((String) crypta.get(key)).getBytes())); ++ } ++ } catch (Exception _) { + } + } + Property changes on: trunk/rssowl/debian/patches/06_use-jce.patch ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/rssowl.1 =================================================================== --- trunk/rssowl/debian/rssowl.1 (rev 0) +++ trunk/rssowl/debian/rssowl.1 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,36 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH RSSOWL 1 "enero 6, 2006" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp <n> insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME + Rssowl \- A RSS / RDF / Atom Newsreader written in Java using SWT +.SH SYNOPSIS + rssowl +.SH DESCRIPTION +RSSOwl is a application that lets you gather, organize, update,and store information from any compliant source in a convenient, +easy to use interface, save selected information in various formats for offline viewing and sharing, and much more. + +Read News in a tabfolder, save favorites in categories, Export to PDF, RTF, HTML, OPML, Import Feeds from OPML, perform fulltext-search, +use the integrated browser. + +RSSOwl is free software and you may use it without paying for it.If you like the tool, and want to contribute, a donation is possible +via paypal, following this URL: + +http://sourceforge.net/donate/index.php?group_id=86683 + +.PP +.SH AUTHOR + Gerardo Curiel <[EMAIL PROTECTED]> wrote this page for inclusion in the Debian project, but may be used by others. Property changes on: trunk/rssowl/debian/rssowl.1 ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/rssowl.desktop =================================================================== --- trunk/rssowl/debian/rssowl.desktop (rev 0) +++ trunk/rssowl/debian/rssowl.desktop 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,17 @@ +[Desktop Entry] +Encoding=UTF-8 +BinaryPattern=rssowl; +Name=RSSOwl +Comment=RSSOwl - Free RSS / RDF / Atom Newsreader +MimeType= +Exec=rssowl +GenericName=RSS & RDF Newsreader +Icon=rssowl +TerminalOptions= +Path= +Type=Application +Terminal=0 +X-KDE-StartupNotify=true +X-DCOP-ServiceType=Multi +Categories=Network + Property changes on: trunk/rssowl/debian/rssowl.desktop ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/rssowl.install =================================================================== --- trunk/rssowl/debian/rssowl.install (rev 0) +++ trunk/rssowl/debian/rssowl.install 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,3 @@ +debian/rssowl.desktop usr/share/applications/ +rssowl.jar usr/share/rssowl/ +img/rssowl.xpm usr/share/pixmaps Property changes on: trunk/rssowl/debian/rssowl.install ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/rssowl.manpages =================================================================== --- trunk/rssowl/debian/rssowl.manpages (rev 0) +++ trunk/rssowl/debian/rssowl.manpages 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1 @@ +debian/rssowl.1 Property changes on: trunk/rssowl/debian/rssowl.manpages ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/rssowl.sh =================================================================== --- trunk/rssowl/debian/rssowl.sh (rev 0) +++ trunk/rssowl/debian/rssowl.sh 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,11 @@ +#!/bin/sh +# +# startscript for rssowl +# + +# This makes the embedded browser work. + +export XPCOM_DIR="/usr/lib/xulrunner" +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$XPCOM_DIR + +exec java -Djava.library.path=/usr/lib/ -cp /usr/share/rssowl/rssowl.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/itext.jar:/usr/share/eclipse/plugins/org.eclipse.core.runtime_3.1.1.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar:/usr/share/java/jdom1.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-codec.jar net.sourceforge.rssowl.controller.RSSOwlLoader "$@" Property changes on: trunk/rssowl/debian/rssowl.sh ___________________________________________________________________ Name: svn:executable + Added: trunk/rssowl/debian/rules =================================================================== --- trunk/rssowl/debian/rules (rev 0) +++ trunk/rssowl/debian/rules 2006-09-24 18:40:53 UTC (rev 2485) @@ -0,0 +1,23 @@ +#!/usr/bin/make -f + +# Using java-gcj-compat + +JAVA_HOME_DIRS := /usr/lib/jvm/java-gcj +ANT_HOME := /usr/share/ant +DEB_JARS := /usr/lib/java/swt-3.1.jar /usr/share/ant/lib/ant-launcher.jar /usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.jar /usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar + +ANT_ARGS= -Dcompile.optimize=false -buildfile src/build.xml + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_ANT_BUILD_TARGET = deploy_linux +DEB_INSTALL_CHANGELOGS_ALL := doc/CHANGELOG.txt + +clean:: + rm -f rssowl.jar + +install/rssowl:: + cp -f debian/rssowl.sh debian/rssowl/usr/bin/rssowl + Property changes on: trunk/rssowl/debian/rules ___________________________________________________________________ Name: svn:executable + _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
