r45093 - in /packages/scilab-toolboxes/metanet/trunk/debian: changelog control docs patches/fixbuildissue.diff patches/series rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Fri Jun 22 22:32:50 UTC 2012
Author: sylvestre
Date: Fri Jun 22 22:32:49 2012
New Revision: 45093
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45093
Log:
for the release
Added:
packages/scilab-toolboxes/metanet/trunk/debian/patches/fixbuildissue.diff
packages/scilab-toolboxes/metanet/trunk/debian/patches/series
Modified:
packages/scilab-toolboxes/metanet/trunk/debian/changelog
packages/scilab-toolboxes/metanet/trunk/debian/control
packages/scilab-toolboxes/metanet/trunk/debian/docs
packages/scilab-toolboxes/metanet/trunk/debian/rules
Modified: packages/scilab-toolboxes/metanet/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/metanet/trunk/debian/changelog?rev=45093&op=diff
==============================================================================
--- packages/scilab-toolboxes/metanet/trunk/debian/changelog (original)
+++ packages/scilab-toolboxes/metanet/trunk/debian/changelog Fri Jun 22 22:32:49 2012
@@ -2,4 +2,5 @@
* Initial package (Closes: #673758)
- -- Sylvestre Ledru <sylvestre at debian.org> Sun, 19 Feb 2012 10:55:57 +0100
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 23 Jun 2012 00:19:12 +0200
+
Modified: packages/scilab-toolboxes/metanet/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/metanet/trunk/debian/control?rev=45093&op=diff
==============================================================================
--- packages/scilab-toolboxes/metanet/trunk/debian/control (original)
+++ packages/scilab-toolboxes/metanet/trunk/debian/control Fri Jun 22 22:32:49 2012
@@ -3,18 +3,18 @@
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Sylvestre Ledru <sylvestre at debian.org>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, scilab (>= 5.4.0),
- scilab-doc
+Build-Depends: debhelper (>= 7), autotools-dev, cdbs, scilab (>= 5.4.0~),
+ scilab-doc, default-jdk, gfortran, ant
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/scilab-toolboxes/metanet/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/scilab-toolboxes/metanet/trunk
Homepage: http://forge.scilab.org/index.php/p/metanet/
Standards-Version: 3.9.3
Package: scilab-metanet
-Architecture: all
+Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, scilab (>= 5.4.0)
Description: Scilab graphs and networks computations module.
A number of algorithms solving classical graph problems and minimal cost flow
network are provided in this module.
This extension is fully integrated in the Scilab environment and provides
- display and interaction on graphs.
+ display and interaction on graphs.
Modified: packages/scilab-toolboxes/metanet/trunk/debian/docs
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/metanet/trunk/debian/docs?rev=45093&op=diff
==============================================================================
--- packages/scilab-toolboxes/metanet/trunk/debian/docs (original)
+++ packages/scilab-toolboxes/metanet/trunk/debian/docs Fri Jun 22 22:32:49 2012
@@ -1,5 +1,3 @@
-config.txt
readme.txt
-release_notes.txt
-detailed_changelog.txt
+changelog.txt
Added: packages/scilab-toolboxes/metanet/trunk/debian/patches/fixbuildissue.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/metanet/trunk/debian/patches/fixbuildissue.diff?rev=45093&op=file
==============================================================================
--- packages/scilab-toolboxes/metanet/trunk/debian/patches/fixbuildissue.diff (added)
+++ packages/scilab-toolboxes/metanet/trunk/debian/patches/fixbuildissue.diff Fri Jun 22 22:32:49 2012
@@ -1,0 +1,187 @@
+commit 70195a947647db3b09a125b2b5034e326cf88e3a
+Author: Clément DAVID <clement.david at scilab-enterprises.com>
+Date: Tue Jun 19 16:30:46 2012 +0200
+
+ use SimpleTab instead of Tab as a common interface
+
+diff --git a/src/java/org/scilab/modules/metanet/MetanetTab.java b/src/java/org/scilab/modules/metanet/MetanetTab.java
+index 5f0d496..f991cef 100644
+--- a/src/java/org/scilab/modules/metanet/MetanetTab.java
++++ b/src/java/org/scilab/modules/metanet/MetanetTab.java
+@@ -43,6 +43,7 @@ import org.scilab.modules.graph.actions.UndoAction;
+ import org.scilab.modules.graph.actions.ZoomInAction;
+ import org.scilab.modules.graph.actions.ZoomOutAction;
+ import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
++import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
+ import org.scilab.modules.gui.menu.Menu;
+ import org.scilab.modules.gui.menu.ScilabMenu;
+ import org.scilab.modules.gui.menubar.MenuBar;
+@@ -53,17 +54,13 @@ import org.scilab.modules.gui.messagebox.ScilabModalDialog.ButtonType;
+ import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
+ import org.scilab.modules.gui.pushbutton.PushButton;
+ import org.scilab.modules.gui.tab.SimpleTab;
+-import org.scilab.modules.gui.tab.Tab;
+ import org.scilab.modules.gui.tabfactory.ScilabTabFactory;
+ import org.scilab.modules.gui.textbox.ScilabTextBox;
+-import org.scilab.modules.gui.textbox.TextBox;
+ import org.scilab.modules.gui.toolbar.ScilabToolBar;
+ import org.scilab.modules.gui.toolbar.ToolBar;
+ import org.scilab.modules.gui.utils.BarUpdater;
+ import org.scilab.modules.gui.utils.ClosingOperationsManager;
+ import org.scilab.modules.gui.utils.WindowsConfigurationManager;
+-import org.scilab.modules.gui.window.ScilabWindow;
+-import org.scilab.modules.gui.window.Window;
+ import org.scilab.modules.metanet.actions.CircuitAction;
+ import org.scilab.modules.metanet.actions.CloseAction;
+ import org.scilab.modules.metanet.actions.FitDiagramToViewAction;
+@@ -91,7 +88,7 @@ import org.scilab.modules.metanet.utils.MetanetMessages;
+ import com.mxgraph.swing.mxGraphComponent;
+ import com.mxgraph.view.mxGraph;
+
+-public class MetanetTab extends SwingScilabTab implements Tab {
++public class MetanetTab extends SwingScilabTab implements SimpleTab {
+ private static final long serialVersionUID = 1L;
+
+ public static final String DEFAULT_WIN_UUID = "metanet-default-window";
+@@ -699,51 +696,17 @@ public class MetanetTab extends SwingScilabTab implements Tab {
+ return diagrams;
+ }
+
+- private Window createDefaultWindow() {
+- final Window win;
++ private SwingScilabWindow createDefaultWindow() {
++ final SwingScilabWindow win;
+
+- final Window configuration = WindowsConfigurationManager.createWindow(DEFAULT_WIN_UUID, false);
++ final SwingScilabWindow configuration = WindowsConfigurationManager.createWindow(DEFAULT_WIN_UUID, false);
+ if (configuration != null) {
+ win = configuration;
+ } else {
+- win = ScilabWindow.createWindow();
++ win = new SwingScilabWindow();
+ }
+
+ win.addTab(this);
+ return win;
+ }
+-
+- /*
+- * Tab implementation
+- */
+-
+- @Deprecated
+- @Override
+- public void addToolBar(ToolBar toolBarToAdd) {
+- setToolBar(toolBarToAdd);
+- }
+-
+- @Deprecated
+- @Override
+- public void addMenuBar(MenuBar menuBarToAdd) {
+- setMenuBar(menuBarToAdd);
+- }
+-
+- @Deprecated
+- @Override
+- public void addInfoBar(TextBox infoBarToAdd) {
+- setInfoBar(infoBarToAdd);
+- }
+-
+- @Deprecated
+- @Override
+- public SimpleTab getAsSimpleTab() {
+- return this;
+- }
+-
+- @Deprecated
+- @Override
+- public Window getParentWindow() {
+- return createDefaultWindow();
+- }
+ }
+diff --git a/src/java/org/scilab/modules/metanet/ViewPortTab.java b/src/java/org/scilab/modules/metanet/ViewPortTab.java
+index 51ce959..216020d 100644
+--- a/src/java/org/scilab/modules/metanet/ViewPortTab.java
++++ b/src/java/org/scilab/modules/metanet/ViewPortTab.java
+@@ -5,23 +5,18 @@ import java.util.ListIterator;
+ import java.util.UUID;
+
+ import org.scilab.modules.gui.bridge.tab.SwingScilabTab;
+-import org.scilab.modules.gui.menubar.MenuBar;
++import org.scilab.modules.gui.bridge.window.SwingScilabWindow;
+ import org.scilab.modules.gui.tab.SimpleTab;
+-import org.scilab.modules.gui.tab.Tab;
+ import org.scilab.modules.gui.tabfactory.ScilabTabFactory;
+-import org.scilab.modules.gui.textbox.TextBox;
+-import org.scilab.modules.gui.toolbar.ToolBar;
+ import org.scilab.modules.gui.utils.ClosingOperationsManager;
+ import org.scilab.modules.gui.utils.WindowsConfigurationManager;
+-import org.scilab.modules.gui.window.ScilabWindow;
+-import org.scilab.modules.gui.window.Window;
+ import org.scilab.modules.metanet.configuration.ConfigurationManager;
+ import org.scilab.modules.metanet.graph.MetanetDiagram;
+ import org.scilab.modules.metanet.utils.MetanetMessages;
+
+ import com.mxgraph.swing.mxGraphOutline;
+
+-public final class ViewPortTab extends SwingScilabTab implements Tab {
++public final class ViewPortTab extends SwingScilabTab implements SimpleTab {
+ public static final String DEFAULT_WIN_UUID = "metanet-viewport-default-window";
+ public static final String DEFAULT_TAB_UUID = "metanet-viewport-default-tab";
+
+@@ -145,51 +140,17 @@ public final class ViewPortTab extends SwingScilabTab implements Tab {
+ setContentPane(outline);
+ }
+
+- private Window createDefaultWindow() {
+- final Window win;
++ private SwingScilabWindow createDefaultWindow() {
++ final SwingScilabWindow win;
+
+- final Window configuration = WindowsConfigurationManager.createWindow(DEFAULT_WIN_UUID, false);
++ final SwingScilabWindow configuration = WindowsConfigurationManager.createWindow(DEFAULT_WIN_UUID, false);
+ if (configuration != null) {
+ win = configuration;
+ } else {
+- win = ScilabWindow.createWindow();
++ win = new SwingScilabWindow();
+ }
+
+ win.addTab(this);
+ return win;
+ }
+-
+- /*
+- * Implement Tab
+- */
+-
+- @Deprecated
+- @Override
+- public void addToolBar(ToolBar toolBarToAdd) {
+- // no toolbar
+- }
+-
+- @Deprecated
+- @Override
+- public void addMenuBar(MenuBar menuBarToAdd) {
+- // no menubar
+- }
+-
+- @Deprecated
+- @Override
+- public void addInfoBar(TextBox infoBarToAdd) {
+- // no infobar
+- }
+-
+- @Deprecated
+- @Override
+- public SimpleTab getAsSimpleTab() {
+- return this;
+- }
+-
+- @Deprecated
+- @Override
+- public Window getParentWindow() {
+- return createDefaultWindow();
+- }
+ }
Added: packages/scilab-toolboxes/metanet/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/metanet/trunk/debian/patches/series?rev=45093&op=file
==============================================================================
--- packages/scilab-toolboxes/metanet/trunk/debian/patches/series (added)
+++ packages/scilab-toolboxes/metanet/trunk/debian/patches/series Fri Jun 22 22:32:49 2012
@@ -1,0 +1,1 @@
+fixbuildissue.diff
Modified: packages/scilab-toolboxes/metanet/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab-toolboxes/metanet/trunk/debian/rules?rev=45093&op=diff
==============================================================================
--- packages/scilab-toolboxes/metanet/trunk/debian/rules (original)
+++ packages/scilab-toolboxes/metanet/trunk/debian/rules Fri Jun 22 22:32:49 2012
@@ -4,7 +4,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
build-indep:
- DEB_MAKE_ENVVARS=SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/bin/scilab -nw -f builder.sce
+ echo "exit();"|DEB_MAKE_ENVVARS=SCI_DISABLE_TK=1 SCI_JAVA_ENABLE_HEADLESS=1 DOCBOOK_ROOT=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/bin/scilab -nw -f builder.sce
clean::
rm -fr build-stamp help/*/scilab_*_help/ jar/
More information about the debian-science-commits
mailing list