[med-svn] [Git][med-team/jaligner][master] 4 commits: DO NOT MERGE
Michael R. Crusoe (@crusoe)
gitlab at salsa.debian.org
Tue Nov 1 13:39:05 GMT 2022
Michael R. Crusoe pushed to branch master at Debian Med / jaligner
Commits:
c6dd1fd0 by Michael R. Crusoe at 2022-11-01T14:17:29+01:00
DO NOT MERGE
- - - - -
53add556 by Michael R. Crusoe at 2022-11-01T14:31:37+01:00
Drop JNLP build-dep
- - - - -
eb305c03 by Michael R. Crusoe at 2022-11-01T14:34:20+01:00
routine-update: Standards-Version: 4.6.1
- - - - -
055a400d by Michael R. Crusoe at 2022-11-01T14:34:32+01:00
routine-update: Ready to upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/no_jnlp
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+jaligner (1.0+dfsg-9) unstable; urgency=medium
+
+ * Drop JNLP build-dep
+ * Standards-Version: 4.6.1 (routine-update)
+
+ -- Michael R. Crusoe <crusoe at debian.org> Tue, 01 Nov 2022 14:34:32 +0100
+
jaligner (1.0+dfsg-8) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -1,7 +1,7 @@
Source: jaligner
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Tim Booth <tbooth at ceh.ac.uk>,
- Michael R. Crusoe <michael.crusoe at gmail.com>,
+ Michael R. Crusoe <crusoe at debian.org>,
Pranav Ballaney <ballaneypranav at gmail.com>
Section: science
Priority: optional
@@ -9,10 +9,9 @@ Build-Depends: debhelper-compat (= 13),
default-jdk
Build-Depends-Indep: junit4,
javahelper,
- icedtea-netx,
asciidoctor,
maven-repo-helper
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Vcs-Browser: https://salsa.debian.org/med-team/jaligner
Vcs-Git: https://salsa.debian.org/med-team/jaligner.git
Homepage: https://github.com/ahmedmoustafa/JAligner
=====================================
debian/copyright
=====================================
@@ -19,7 +19,7 @@ License: GPL-2+
Files: debian/*
Copyright: 2010-2014 Tim Booth <tbooth at ceh.ac.uk>
- 2015 Michael Crusoe <michael.crusoe at gmail.com>
+ 2015, 2022 Michael R. Crusoe <crusoe at debian.org>
2015-2018 Andreas Tille <tille at debian.org>
License: GPL-2+
=====================================
debian/patches/no_jnlp
=====================================
@@ -0,0 +1,218 @@
+Author: Michael R. Crusoe <crusoe at debian.org>
+Description: Drop JNLP parts
+Forwarded: not-needed
+Debian isn't distributing this as an applet.
+--- jaligner.orig/src/jaligner/ui/filechooser/FileChooserJNLP.java
++++ /dev/null
+@@ -1,83 +0,0 @@
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- */
+-
+-package jaligner.ui.filechooser;
+-
+-import java.io.InputStream;
+-import java.util.logging.Logger;
+-
+-import javax.jnlp.FileContents;
+-import javax.jnlp.FileOpenService;
+-import javax.jnlp.FileSaveService;
+-import javax.jnlp.ServiceManager;
+-
+-/**
+- * Opens and saves files.
+- *
+- * @author Ahmed Moustafa
+- */
+-
+-public class FileChooserJNLP extends FileChooser {
+- private static final Logger logger = Logger.getLogger(FileChooserJNLP.class.getName());
+-
+- /**
+- * Shows a dialog to select a file.
+- *
+- * @return InputStream
+- * @throws FileChooserException
+- */
+- public NamedInputStream open() throws FileChooserException {
+- try {
+- FileOpenService fos = (FileOpenService) ServiceManager.lookup(FileOpenService.class.getName());
+- FileContents fc = null;
+- if ((fc = fos.openFileDialog(getUserDirectory(), null)) != null) {
+- logger.info("Loaded: " + fc.getName());
+- return new NamedInputStream(fc.getName(), fc.getInputStream());
+- } else {
+- return null;
+- }
+- } catch (Exception e) {
+- String message = "Failed open: " + e.getMessage();
+- logger.warning(message);
+- throw new FileChooserException(message);
+- }
+- }
+-
+- /**
+- * Saves an input stream to a file.
+- *
+- * @param is
+- * @param fileName
+- * @return Boolean
+- * @throws FileChooserException
+- */
+- public boolean save(InputStream is, String fileName) throws FileChooserException {
+- try {
+- FileSaveService fss = (FileSaveService) ServiceManager.lookup(FileSaveService.class.getName());
+- FileContents fc = fss.saveFileDialog(getUserDirectory(), null, is, fileName);
+- if (fc != null) {
+- logger.info("Saved: " + fc.getName());
+- return true;
+- } else {
+- return false;
+- }
+- } catch (Exception e) {
+- String message = "Failed save: " + e.getMessage();
+- logger.warning(message);
+- throw new FileChooserException(message);
+- }
+- }
+-}
+\ No newline at end of file
+--- jaligner.orig/src/jaligner/ui/filechooser/FileChooserTrusted.java
++++ jaligner/src/jaligner/ui/filechooser/FileChooserTrusted.java
+@@ -33,7 +33,7 @@
+ */
+
+ public class FileChooserTrusted extends FileChooser {
+- private static final Logger logger = Logger.getLogger(FileChooserJNLP.class.getName());
++ private static final Logger logger = Logger.getLogger(FileChooserTrusted.class.getName());
+
+ /**
+ * Shows a dialog to select a file.
+@@ -99,4 +99,4 @@
+ throw new FileChooserException(message);
+ }
+ }
+-}
+\ No newline at end of file
++}
+--- jaligner.orig/src/jaligner/ui/clipboard/ClipboardHandlerFactory.java
++++ jaligner/src/jaligner/ui/clipboard/ClipboardHandlerFactory.java
+@@ -43,12 +43,8 @@
+ */
+ public static ClipboardHandler getClipboardHandler( ) {
+ if (instance == null) {
+- if (Commons.isJnlp()) {
+- instance = new ClipboardHandlerJNLP();
+- } else {
+- instance = new ClipboardHandlerAWT();
+- }
++ instance = new ClipboardHandlerAWT();
+ }
+ return instance;
+ }
+-}
+\ No newline at end of file
++}
+--- jaligner.orig/src/jaligner/ui/clipboard/ClipboardHandlerJNLP.java
++++ /dev/null
+@@ -1,69 +0,0 @@
+-/*
+- * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
+- * of the License, or (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- */
+-
+-package jaligner.ui.clipboard;
+-
+-import java.awt.datatransfer.DataFlavor;
+-import java.awt.datatransfer.StringSelection;
+-import java.awt.datatransfer.Transferable;
+-import java.util.logging.Level;
+-import java.util.logging.Logger;
+-
+-import javax.jnlp.ClipboardService;
+-import javax.jnlp.ServiceManager;
+-
+-/**
+- * Sets and gets the contents of the system clipboard.
+- *
+- * @author Ahmed Moustafa
+- */
+-
+-public class ClipboardHandlerJNLP implements ClipboardHandler {
+- private static Logger logger = Logger.getLogger(ClipboardHandlerJNLP.class.getName());
+-
+- /**
+- * Gets the contents of the system clipboard
+- *
+- * @return The text system clipboad contents
+- */
+- public String getContents() {
+- String contents = null;
+- try {
+- ClipboardService cs = (ClipboardService)ServiceManager.lookup(ClipboardService.class.getName());
+- Transferable data = cs.getContents();
+- if (data != null && data.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+- contents = ((String)(data.getTransferData(DataFlavor.stringFlavor)));
+- }
+- } catch (Exception e) {
+- logger.log(Level.WARNING, "Failed getting the clipboard contents: " + e.getMessage(), e );
+- }
+- return contents;
+- }
+-
+- /**
+- * Sets the contents of the system clipboard
+- *
+- * @param s clipboard contents to set
+- */
+- public void setContents(String s) {
+- try {
+- ClipboardService cs = (ClipboardService)ServiceManager.lookup(ClipboardService.class.getName());
+- cs.setContents(new StringSelection(s));
+- } catch (Exception e) {
+- logger.log(Level.WARNING, "Failed setting the clipboard contents: " + e.getMessage(), e );
+- }
+- }
+-}
+\ No newline at end of file
+--- jaligner.orig/src/jaligner/ui/filechooser/FileChooserFactory.java
++++ jaligner/src/jaligner/ui/filechooser/FileChooserFactory.java
+@@ -43,12 +43,8 @@
+ */
+ public static FileChooser getFileChooser( ) {
+ if (instance == null) {
+- if (Commons.isJnlp()) {
+- instance = new FileChooserJNLP();
+- } else {
+- instance = new FileChooserTrusted();
+- }
++ instance = new FileChooserTrusted();
+ }
+ return instance;
+ }
+-}
+\ No newline at end of file
++}
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
f267efdf3bc29291eddd380bba127b8ed56f2dc2.patch
+no_jnlp
=====================================
debian/rules
=====================================
@@ -4,8 +4,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export CLASSPATH=/usr/share/icedtea-web/netx.jar
-
%:
dh $@ --with javahelper --with jh_maven_repo_helper
View it on GitLab: https://salsa.debian.org/med-team/jaligner/-/compare/0acaf36427847cfb59017b68a873065c2b9d2614...055a400d3966bed3fd460dbd8deb37aeba5bed9a
--
View it on GitLab: https://salsa.debian.org/med-team/jaligner/-/compare/0acaf36427847cfb59017b68a873065c2b9d2614...055a400d3966bed3fd460dbd8deb37aeba5bed9a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20221101/77e10e29/attachment-0001.htm>
More information about the debian-med-commit
mailing list