[Git][java-team/umlet][debian/sid] 4 commits: Make sure all files are stored identically
Andreas Tille (@tille)
gitlab at salsa.debian.org
Tue Oct 8 16:10:10 BST 2024
Andreas Tille pushed to branch debian/sid at Debian Java Maintainers / umlet
Commits:
558e7e47 by Andreas Tille at 2024-10-08T15:54:43+02:00
Make sure all files are stored identically
- - - - -
b5ca2fa5 by Andreas Tille at 2024-10-08T17:09:10+02:00
d/copyright: DEP5 to exclude windows exe and .git files which might disrupt import
- - - - -
563d5356 by Andreas Tille at 2024-10-08T17:09:21+02:00
New upstream version 15.1+ds
- - - - -
1dd881b6 by Andreas Tille at 2024-10-08T17:09:24+02:00
Update upstream source from tag 'upstream/15.1+ds'
Update to upstream version '15.1+ds'
with Debian dir 8e81ebaff5c8127dc60255331eb0d8ebcd1982e3
- - - - -
13 changed files:
- − .gitattributes
- − .github/FUNDING.yml
- − .github/workflows/maven.yml
- − .gitignore
- debian/changelog
- debian/copyright
- debian/watch
- − umlet-standalone/src/exe/Umlet.exe
- − umlet-standalone/src/exe/Umlet.ico
- − umlet-standalone/src/exe/img/umlet_logo.png
- − umlet-standalone/src/exe/launch4j_project.xml
- − umlet-standalone/src/exe/umlet.desktop
- − umlet-standalone/src/exe/umlet.sh
Changes:
=====================================
.gitattributes deleted
=====================================
@@ -1 +0,0 @@
-* -text
=====================================
.github/FUNDING.yml deleted
=====================================
@@ -1,13 +0,0 @@
-# These are supported funding model platforms
-
-github: [umlet]
-patreon: umlet
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: ["https://paypal.me/umlet", "https://www.umlet.com"]
=====================================
.github/workflows/maven.yml deleted
=====================================
@@ -1,42 +0,0 @@
-# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Java CI with Maven
-
-on:
- push:
- branches: [ master ]
- pull_request:
- branches: [ master ]
-
-jobs:
- build:
-
- runs-on: ubuntu-latest
-
- steps:
- - uses: actions/checkout at v2
- - name: Set up JDK 11
- uses: actions/setup-java at v2
- with:
- java-version: '11'
- distribution: 'adopt'
- cache: maven
- - name: Build with Maven
- run: mvn clean install -P checks
- - uses: actions/upload-artifact at v2
- with:
- name: Umlet Eclipse P2 Repository
- path: umlet-eclipse-p2/target/*.zip
- - uses: actions/upload-artifact at v2
- with:
- name: Umlet Standalone
- path: umlet-standalone/target/*.zip
- - uses: actions/upload-artifact at v2
- with:
- name: Umlet VSCode Plugin
- path: umlet-vscode/target/*.vsix
- - uses: actions/upload-artifact at v2
- with:
- name: Umletino (Web Version)
- path: umlet-web/target/*.zip
=====================================
.gitignore deleted
=====================================
@@ -1,7 +0,0 @@
-bin/
-target/
-.idea/
-*.iml
-.factorypath
-.classpath
-# .project must be checked in because it is used for the linkedResources for umlet-eclipse-plugin
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-umlet (15.1-1) UNRELEASED; urgency=medium
+umlet (15.1+ds-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream version
@@ -18,6 +18,8 @@ umlet (15.1-1) UNRELEASED; urgency=medium
* Use secure URI in Homepage field.
* watch file standard 4 (routine-update)
* Short dh
+ * d/copyright: DEP5 to exclude windows exe and .git files which might
+ disrupt import
-- Andreas Tille <tille at debian.org> Tue, 08 Oct 2024 11:50:11 +0200
=====================================
debian/copyright
=====================================
@@ -1,23 +1,48 @@
-This package was debianized by Benjamin Mesing <bensmail at gmx.net> on
-Sat, 2 Dec 2006ff.
-
-UMLet was downloaded from http://www.umlet.com
-
-Upstream UMLet Author: M. Auer, J. Poelz, A. Fuernweger, L. Meyer and T. Tschurtschenthaler <info at umlet.com>
-
-UMLet License:
-You are free to distribute this software under the terms of
-the GNU General Public License 2.
-
-Main source:
-Copyright 2009, M. Auer, J. Poelz, A. Fuernweger, L. Meyer and T. Tschurtschenthaler <info at umlet.com>
-
-Source code for Windows Exe file (subfolder src/umlet_exe:
-Copyright © TU Wien 2008
-
-
-On Debian systems, the complete text of the GNU General Public
-License 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is © 2006-2009, Benjamin Mesing <bensmail at gmx.net>
-and is licensed under the GPL-2.
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: umlet
+Source: https://github.com/umlet/umlet
+Files-Excluded: .git*
+ umlet-standalone/src/exe
+
+Files: *
+Copyright: 2005-2022 M. Auer, J. Poelz, A. Fuernweger, L. Meyer and T. Tschurtschenthaler <info at umlet.com>
+License: GPL-2
+
+Files: umlet-swing/src/main/java/com/baselet/gui/filedrop/FileDrop.java
+Copyright: 2001 Robert Harder
+License: GPL-2
+
+Files: umlet-gwt/src/main/java/com/baselet/gwt/client/scripts/blob-stream.js
+Copyright: Joyent, Inc. and other Node contributors.
+License: MIT
+
+Files: debian/*
+Copyright: 2006-2015 Benjamin Mesing <bensmail at gmx.net>
+License: GPL-2
+
+License: GPL-2
+ You are free to distribute this software under the terms of
+ the GNU General Public License 2.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ USE OR OTHER DEALINGS IN THE SOFTWARE.
=====================================
debian/watch
=====================================
@@ -1,6 +1,6 @@
version=4
-
-https://github.com/umlet/umlet/tags \
- (?:.*?/)?20.*UMLet_v([\d\.]*)\.tar\.gz
+
+opts="repacksuffix=+ds,dversionmangle=auto,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+ https://github.com/umlet/umlet/tags (?:.*?/)?20.*UMLet_v([\d\.]*)\.tar\.gz
=====================================
umlet-standalone/src/exe/Umlet.exe deleted
=====================================
Binary files a/umlet-standalone/src/exe/Umlet.exe and /dev/null differ
=====================================
umlet-standalone/src/exe/Umlet.ico deleted
=====================================
Binary files a/umlet-standalone/src/exe/Umlet.ico and /dev/null differ
=====================================
umlet-standalone/src/exe/img/umlet_logo.png deleted
=====================================
Binary files a/umlet-standalone/src/exe/img/umlet_logo.png and /dev/null differ
=====================================
umlet-standalone/src/exe/launch4j_project.xml deleted
=====================================
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launch4jConfig>
- <dontWrapJar>true</dontWrapJar>
- <headerType>gui</headerType>
- <jar>.\umlet.jar</jar>
- <outfile>Umlet.exe</outfile>
- <errTitle></errTitle>
- <cmdLine></cmdLine>
- <chdir></chdir>
- <priority>normal</priority>
- <downloadUrl>https://adoptopenjdk.net/</downloadUrl>
- <supportUrl></supportUrl>
- <stayAlive>false</stayAlive>
- <restartOnCrash>false</restartOnCrash>
- <manifest></manifest>
- <icon>Umlet.ico</icon>
- <jre>
- <path>%JAVA_HOME%;%PATH%</path>
- <bundledJre64Bit>false</bundledJre64Bit>
- <bundledJreAsFallback>false</bundledJreAsFallback>
- <minVersion>1.6.0</minVersion>
- <maxVersion></maxVersion>
- <jdkPreference>preferJre</jdkPreference>
- <runtimeBits>64/32</runtimeBits>
- </jre>
-</launch4jConfig>
\ No newline at end of file
=====================================
umlet-standalone/src/exe/umlet.desktop deleted
=====================================
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=UMLet
-GenericName=UMLet
-Comment=Free UML Tool for Fast UML Diagrams
-Exec=java -Dsun.java2d.xrender=f -jar umlet.jar
-Icon=img/umlet_logo.png
-Terminal=false
-Categories=Development;
-StartupNotify=true
=====================================
umlet-standalone/src/exe/umlet.sh deleted
=====================================
@@ -1,76 +0,0 @@
-#!/bin/sh
-# activate job monitoring
-# @see: http://www.linuxforums.org/forum/programming-scripting/139939-fg-no-job-control-script.html
-set -m
-
-# ---------------------------------------------------------------------------------
-# UMLet Startup Script
-# Shell script for running umlet from the command prompt in linux
-#
-# Environment Variable Prerequisites
-#
-# JAVA_HOME | JAVA_CMD Must point at your Java installation or Java executable.
-# UMLET_JAVA_OPTS (optional) additional Java start options (-X..., -D...)
-# UMLET_HOME (optional) program directory of UMLet
-# ---------------------------------------------------------------------------------
-#
-# If you want to put umlet.sh in your home bin directory ($HOME/bin/) to start it from anywhere with
-# $ umlet.sh myDiagram.uxf
-# you must export the UMLET_HOME environment variable with the full qualified path of the UMLet installation directory.
-# export UMLET_HOME=/path/to/umlet
-
-_UMLET_HOME="$(cd $(dirname $0);pwd)"
-
-# check and use programDir for backward compatibility
-if [ ! -z "${programDir}" ] ; then
- echo "programDir is deprecated. Please use UMLET_HOME instead."
- _UMLET_HOME="${programDir}"
-fi
-
-# UMLET_HOME wins against deprecated programDir
-if [ ! -z "${UMLET_HOME}" ] ; then
- _UMLET_HOME="${UMLET_HOME}"
-fi
-
-# try to find the Java executable if JAVA_CMD is empty
-if [ ! -x "${JAVA_CMD}" ] ; then
- if [ -z "${JAVA_HOME}" ] ; then
- JAVA_CMD=$(which java)
- else
- JAVA_CMD="${JAVA_HOME}/bin/java"
- fi
-fi
-
-# exit script if JAVA_CMD is empty
-if [ ! -x "${JAVA_CMD}" ] ; then
- echo "One of these JAVA_HOME, JAVA_CMD environment variables is not defined correctly" >&2
- echo "One of this environment variable is needed to run this program" >&2
- exit 1
-fi
-
-# platform independent Java options
-_UMLET_JAVA_OPTS="-Dsun.java2d.xrender=f ${UMLET_JAVA_OPTS}"
-
-# platform dependent Java options
-_OS_NAME="$(uname -s)"
-case ${_OS_NAME} in
- 'Darwin')
- _UMLET_JAVA_OPTS=" \
- -Xdock:icon=${_UMLET_HOME}/img/umlet_logo.png \
- -Xdock:name=UMLet \
- ${_UMLET_JAVA_OPTS} \
- -Dapple.laf.useScreenMenuBar=true"
- ;;
- *)
- ;;
-esac
-
-if [ $# -eq 1 ] ; then
- _UMLET_OPTS=-filename="${1}"
-else
- _UMLET_OPTS="$@"
-fi
-
-exec "${JAVA_CMD}" \
- ${_UMLET_JAVA_OPTS} \
- -jar ${_UMLET_HOME}/umlet.jar ${_UMLET_OPTS}
View it on GitLab: https://salsa.debian.org/java-team/umlet/-/compare/d1cff81cd3b1ba7be1fa44c7c34bca68fdbac852...1dd881b6e35f2dafbb3aebf7c164e38f63fbf870
--
View it on GitLab: https://salsa.debian.org/java-team/umlet/-/compare/d1cff81cd3b1ba7be1fa44c7c34bca68fdbac852...1dd881b6e35f2dafbb3aebf7c164e38f63fbf870
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/pkg-java-commits/attachments/20241008/20e64f8b/attachment.htm>
More information about the pkg-java-commits
mailing list