[med-svn] [Git][med-team/jam-lib][master] 14 commits: New upstream version 0.1.git20240425.aec45be+dfsg

Étienne Mollier (@emollier) gitlab at salsa.debian.org
Fri Oct 11 11:21:59 BST 2024



Étienne Mollier pushed to branch master at Debian Med / jam-lib


Commits:
fc4520e0 by Étienne Mollier at 2024-10-11T11:18:33+02:00
New upstream version 0.1.git20240425.aec45be+dfsg
- - - - -
e724ab96 by Étienne Mollier at 2024-10-11T11:18:33+02:00
Update upstream source from tag 'upstream/0.1.git20240425.aec45be+dfsg'

Update to upstream version '0.1.git20240425.aec45be+dfsg'
with Debian dir c0f2be0bffed6ce7c2279fb2b9eb921925460d3d
- - - - -
5c02d735 by Étienne Mollier at 2024-10-11T11:21:53+02:00
remove-mac-only-code.patch: refresh.

- - - - -
10234489 by Étienne Mollier at 2024-10-11T11:22:23+02:00
d/control: declare compliance to standards version 4.7.0.

- - - - -
f41649a3 by Étienne Mollier at 2024-10-11T11:34:02+02:00
d/compat: deleted; d/control: bump to debhelper compat 13.

- - - - -
064e8212 by Étienne Mollier at 2024-10-11T11:44:22+02:00
d/libjam-java-doc.javadoc: fix lintian error in doc-base.

- - - - -
cced8655 by Étienne Mollier at 2024-10-11T11:45:18+02:00
remove-mac-only-code.patch: declare forwarding not-needed.

The change brought by the patch is necessary due to files excluded by
the packaging, thus specific to Debian.

- - - - -
93b3210e by Étienne Mollier at 2024-10-11T11:53:45+02:00
javadoc.patch: dep3 header with forwarding upstream.

- - - - -
fb9d4fd7 by Étienne Mollier at 2024-10-11T11:57:23+02:00
d/control: d/rules does not require root.

- - - - -
36b193be by Étienne Mollier at 2024-10-11T12:04:13+02:00
d/control: libjam-java-doc depends on libjs-jquery and libjs-jquery-ui.

- - - - -
3f21f2cf by Étienne Mollier at 2024-10-11T12:07:47+02:00
d/libjam-java-doc.links: use libjs-* scripts instead of vendored ones.

- - - - -
e94cd3d6 by Étienne Mollier at 2024-10-11T12:09:43+02:00
d/clean: new: cleanup build-java9-only/ directory.

Closes: #1046367

- - - - -
4c0f46f2 by Étienne Mollier at 2024-10-11T12:10:31+02:00
d/control: add myself to uploaders.

- - - - -
86e32c1d by Étienne Mollier at 2024-10-11T12:12:45+02:00
Ready for upload to unstable.

- - - - -


14 changed files:

- build.xml
- debian/changelog
- + debian/clean
- − debian/compat
- debian/control
- debian/libjam-java-doc.javadoc
- + debian/libjam-java-doc.links
- debian/patches/javadoc.patch
- debian/patches/remove-mac-only-code.patch
- src/jam/console/ConsoleApplication.java
- src/jam/framework/AboutBox.java
- src/jam/framework/Application.java
- src/jam/framework/MultiDocApplication.java
- src/jam/mac/Utils.java


Changes:

=====================================
build.xml
=====================================
@@ -31,7 +31,7 @@
         <condition property="isMac">
             <os family="mac"/>
         </condition>
-        <javac source="1.6" target="1.6" srcdir="${src}" destdir="${build}">
+        <javac source="1.8" target="1.8" srcdir="${src}" destdir="${build}">
             <include name="jam/**/*"/>
             <exclude name="jam/**/maconly/*"/>
             <exclude name="jam/**/java9only/*"/>


=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+jam-lib (0.1.git20240425.aec45be+dfsg-1) unstable; urgency=medium
+
+  * New upstream version 0.1.git20240425.aec45be+dfsg
+  * remove-mac-only-code.patch: refresh.
+  * d/control: declare compliance to standards version 4.7.0.
+  * d/compat: deleted; d/control: bump to debhelper compat 13.
+  * d/libjam-java-doc.javadoc: fix lintian error in doc-base.
+  * remove-mac-only-code.patch: declare forwarding not-needed.
+    The change brought by the patch is necessary due to files excluded by
+    the packaging, thus specific to Debian.
+  * javadoc.patch: dep3 header with forwarding upstream.
+  * d/control: d/rules does not require root.
+  * d/control: libjam-java-doc depends on libjs-jquery and libjs-jquery-ui.
+  * d/libjam-java-doc.links: use libjs-* scripts instead of vendored ones.
+  * d/clean: new: cleanup build-java9-only/ directory. (Closes: #1046367)
+  * d/control: add myself to uploaders.
+
+ -- Étienne Mollier <emollier at debian.org>  Fri, 11 Oct 2024 12:10:48 +0200
+
 jam-lib (0.1.git20180106.740247a+dfsg-1) unstable; urgency=medium
 
   * Use git mode in watch file


=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+build-java9-only/


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -1,19 +1,21 @@
 Source: jam-lib
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Andreas Tille <tille at debian.org>
+Uploaders: Andreas Tille <tille at debian.org>,
+           Étienne Mollier <emollier at debian.org>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 13),
                javahelper
 Build-Depends-Indep: default-jdk,
                      default-jdk-doc,
                      libtrove-java,
                      libtrove-java-doc,
                      ant
-Standards-Version: 4.3.0
+Standards-Version: 4.7.0
 Vcs-Browser: https://salsa.debian.org/med-team/jam-lib
 Vcs-Git: https://salsa.debian.org/med-team/jam-lib.git
 Homepage: https://github.com/rambaut/jam-lib
+Rules-Requires-Root: no
 
 Package: libjam-java
 Architecture: all
@@ -29,7 +31,9 @@ Package: libjam-java-doc
 Architecture: all
 Section: doc
 Depends: ${java:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         libjs-jquery,
+         libjs-jquery-ui
 Recommends: ${java:Recommends}
 Description: Java applications look and behave like native applications (documentation)
  JAM provides classes for building desktop applications that look and


=====================================
debian/libjam-java-doc.javadoc
=====================================
@@ -1 +1 @@
-doc /usr/share/doc/libjam-java/api
+doc usr/share/doc/libjam-java/api


=====================================
debian/libjam-java-doc.links
=====================================
@@ -0,0 +1,3 @@
+usr/share/javascript/jquery/jquery.min.js                    usr/share/doc/libjam-java/api/script-dir/jquery-3.7.1.min.js
+usr/share/javascript/jquery-ui/themes/base/jquery-ui.min.css usr/share/doc/libjam-java/api/script-dir/jquery-ui.min.css
+usr/share/javascript/jquery-ui/jquery-ui.min.js              usr/share/doc/libjam-java/api/script-dir/jquery-ui.min.js


=====================================
debian/patches/javadoc.patch
=====================================
@@ -1,5 +1,8 @@
-Last-Update: Thu, 10 Feb 2011 10:26:38 +0100
 Description: Ant control fiel to create javadoc
+Author: Andreas Tille <tille at debian.org>
+Reviewed-By: Étienne Mollier <emollier at debian.org>
+Forwarded: https://github.com/rambaut/jam-lib/pull/3
+Last-Update: 2024-10-11
 
 --- /dev/null
 +++ b/javadoc.xml


=====================================
debian/patches/remove-mac-only-code.patch
=====================================
@@ -1,8 +1,9 @@
 Last-Update: Thu, 10 Feb 2011 10:26:38 +0100
 Description: Strip OSX specific things from build.xml
+Forwarded: not-needed
 
---- a/build.xml
-+++ b/build.xml
+--- jam-lib.orig/build.xml
++++ jam-lib/build.xml
 @@ -7,7 +7,6 @@
      <!-- set global properties for this build -->
      <property name="src" location="src"/>
@@ -25,7 +26,7 @@ Description: Strip OSX specific things from build.xml
 -        <condition property="isMac">
 -            <os family="mac"/>
 -        </condition>
-         <javac source="1.6" target="1.6" srcdir="${src}" destdir="${build}">
+         <javac source="1.8" target="1.8" srcdir="${src}" destdir="${build}">
              <include name="jam/**/*"/>
 -            <exclude name="jam/**/maconly/*"/>
              <exclude name="jam/**/java9only/*"/>


=====================================
src/jam/console/ConsoleApplication.java
=====================================
@@ -14,6 +14,7 @@ import jam.framework.MenuBarFactory;
 import jam.framework.DocumentFrame;
 
 import javax.swing.*;
+import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 
@@ -27,16 +28,21 @@ public class ConsoleApplication extends Application {
 	}
 
 	public ConsoleApplication(String nameString, String titleString, String aboutString, Icon icon, boolean dontAskSave) throws IOException {
-		this(new ConsoleMenuBarFactory(), nameString, titleString, aboutString, icon, dontAskSave);
+		this(new ConsoleMenuBarFactory(), nameString, titleString, aboutString, null, null, icon, dontAskSave);
+	}
+
+	public ConsoleApplication(String nameString, String titleString, String aboutString, Color aboutBackground, Color aboutForeground, Icon icon, boolean dontAskSave) throws IOException {
+		this(new ConsoleMenuBarFactory(), nameString, titleString, aboutString, aboutBackground, aboutForeground, icon, dontAskSave);
 	}
 
 	public ConsoleApplication(MenuBarFactory menuBarFactory, String nameString, String aboutString, Icon icon, boolean dontAskSave) throws IOException {
-		this(menuBarFactory, nameString, nameString, aboutString, icon, dontAskSave);
+		this(menuBarFactory, nameString, nameString, aboutString, null, null, icon, dontAskSave);
 	}
 
-	public ConsoleApplication(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Icon icon, boolean dontAskSave) throws IOException {
+	public ConsoleApplication(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Color aboutBackground, Color aboutForeground,
+							  Icon icon, boolean dontAskSave) throws IOException {
 
-		super(menuBarFactory, nameString, titleString, aboutString, icon);
+		super(menuBarFactory, nameString, titleString, aboutString, aboutBackground, aboutForeground, icon, null, null);
 
 		this.dontAskSave = dontAskSave;
 


=====================================
src/jam/framework/AboutBox.java
=====================================
@@ -25,6 +25,14 @@ public class AboutBox extends AbstractFrame {
      * and centers it over the parent component.
      */
     public AboutBox(String title, String message, Icon icon) {
+        this(title, message, icon, null,null);
+    }
+
+    /**
+     * Creates an AboutBox with a given title, message and icon
+     * and centers it over the parent component.
+     */
+    public AboutBox(String title, String message, Icon icon, Color background, Color foreground) {
         super();
 
         if (icon != null) {
@@ -48,14 +56,16 @@ public class AboutBox extends AbstractFrame {
 
         JPanel contentsPanel = new JPanel(new GridBagLayout());
         contentsPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-        contentsPanel.setBackground(Color.white);
+        contentsPanel.setBackground(background != null ? background : Color.white);
+        contentsPanel.setForeground(foreground != null ? foreground : Color.black);
 
 //        JLabel iconLabel = new JLabel(icon, JLabel.CENTER);
         JLabel titleLabel = new JLabel(title, JLabel.CENTER);
 
         Font font = titleLabel.getFont();
         titleLabel.setFont(font.deriveFont(32.0f).deriveFont(Font.PLAIN));
-        titleLabel.setIcon(icon);
+        titleLabel.setForeground(foreground);
+        titleLabel.setIcon(IconUtils.resize(icon, 96, 96));
 
         GridBagConstraints c = new GridBagConstraints();
         c.gridwidth = GridBagConstraints.REMAINDER;


=====================================
src/jam/framework/Application.java
=====================================
@@ -37,6 +37,8 @@ public abstract class Application {
     private static String nameString;
     private static String titleString;
     private static String aboutString;
+    private static Color aboutBackground;
+    private static Color aboutForeground;
     private static String websiteURLString;
     private static String helpURLString;
 
@@ -70,6 +72,14 @@ public abstract class Application {
         return aboutString;
     }
 
+    public static Color getAboutBackground() {
+        return aboutBackground;
+    }
+
+    public static Color getAboutForeground() {
+        return aboutForeground;
+    }
+
     public static String getWebsiteURLString() {
         return websiteURLString;
     }
@@ -93,11 +103,19 @@ public abstract class Application {
 
     public Application(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Icon icon,
                        String websiteURLString, String helpURLString) {
+        this(menuBarFactory, nameString, titleString, aboutString, null, null, icon, websiteURLString, helpURLString);
+    }
+
+    public Application(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString,
+                       Color aboutBackground, Color aboutForeground, Icon icon,
+                       String websiteURLString, String helpURLString) {
 
         Application.menuBarFactory = menuBarFactory;
         Application.nameString = nameString;
         Application.titleString = titleString;
         Application.aboutString = aboutString;
+        Application.aboutBackground = aboutBackground;
+        Application.aboutForeground = aboutForeground;
         Application.websiteURLString = websiteURLString;
         Application.helpURLString = helpURLString;
         Application.icon = icon;
@@ -172,7 +190,7 @@ public abstract class Application {
     protected abstract JFrame getDefaultFrame();
 
     public void doAbout() {
-        AboutBox aboutBox = new AboutBox(getTitleString(), getAboutString(), getIcon());
+        AboutBox aboutBox = new AboutBox(getTitleString(), getAboutString(), getIcon(), getAboutBackground(), getAboutForeground());
         //aboutBox.initialize();        //causes about frame to have the menu system from the main frame.
         aboutBox.setVisible(true);
     }


=====================================
src/jam/framework/MultiDocApplication.java
=====================================
@@ -16,6 +16,7 @@ package jam.framework;
 import jam.mac.Utils;
 
 import javax.swing.*;
+import java.awt.*;
 import java.io.File;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -56,6 +57,10 @@ public class MultiDocApplication extends Application {
 		super(menuBarFactory, nameString, titleString, aboutString, icon, websiteURLString, helpURLString);
 	}
 
+	public MultiDocApplication(MenuBarFactory menuBarFactory, String nameString, String titleString, String aboutString, Color aboutBackground, Color aboutForeground, Icon icon, String websiteURLString, String helpURLString) {
+		super(menuBarFactory, nameString, titleString, aboutString, aboutBackground, aboutForeground, icon, websiteURLString, helpURLString);
+	}
+
 	public final void initialize() {
 		// Register the application with the OK. Prior to Java 1.9 this was just
 		// for Mac OS X. Now it uses java.desktop.Desktop to be cross platform


=====================================
src/jam/mac/Utils.java
=====================================
@@ -40,6 +40,8 @@ public class Utils {
 
         try {
             adapter = Class.forName("jam.java9only.ApplicationAdapter");
+        } catch(UnsupportedClassVersionError e) {
+            // probably not Java 9 then...
         } catch (Exception e) {
             // do nothing...
         }



View it on GitLab: https://salsa.debian.org/med-team/jam-lib/-/compare/9d0afb24554d601ca44b1b17ff88c9755e647db0...86e32c1d9b2a70748e368b104aef20bc0713d783

-- 
View it on GitLab: https://salsa.debian.org/med-team/jam-lib/-/compare/9d0afb24554d601ca44b1b17ff88c9755e647db0...86e32c1d9b2a70748e368b104aef20bc0713d783
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/20241011/11fe48b2/attachment-0001.htm>


More information about the debian-med-commit mailing list