[Git][java-team/libjgraph-java][master] 23 commits: Acknowledging NMU

Pierre Gruet (@pgt) gitlab at salsa.debian.org
Tue Aug 23 06:06:28 BST 2022



Pierre Gruet pushed to branch master at Debian Java Maintainers / libjgraph-java


Commits:
95369887 by Pierre Gruet at 2022-08-22T21:56:01+02:00
Acknowledging NMU

- - - - -
c3af83ec by Pierre Gruet at 2022-08-22T22:01:59+02:00
Raising d/Watch version to 4, rewriting it a bit

- - - - -
e6474096 by Pierre Gruet at 2022-08-22T22:02:20+02:00
Repacking through Files-Excluded in d/copyright

- - - - -
7880f9af by Pierre Gruet at 2022-08-22T22:03:34+02:00
Using https form of copyright-format URI

- - - - -
e9e35860 by Pierre Gruet at 2022-08-22T22:04:23+02:00
Renaming BSD-3 stanza to BSD-3-clause in d/copyright

- - - - -
ee35bd58 by Pierre Gruet at 2022-08-22T22:05:06+02:00
Depending on debhelper-compat 13, dropping d/compat

- - - - -
f615911e by Pierre Gruet at 2022-08-22T22:06:11+02:00
Vcs-* fields now point to Salsa

- - - - -
9a735002 by Pierre Gruet at 2022-08-22T22:06:43+02:00
Priority extra is now optional

- - - - -
86686f9c by Pierre Gruet at 2022-08-22T22:07:05+02:00
Rules-Requires-Root: no

- - - - -
f761c5c3 by Pierre Gruet at 2022-08-22T22:09:36+02:00
Deleting unnecessary get-orig-source target in d/rules

- - - - -
0aadcd7d by Pierre Gruet at 2022-08-22T22:10:32+02:00
Raising Standards version to 4.6.1

- - - - -
9d23ffa1 by Pierre Gruet at 2022-08-22T22:17:20+02:00
Updating changelog

- - - - -
039a11db by Pierre Gruet at 2022-08-22T22:18:05+02:00
Set upstream metadata fields: Repository-Browse.

Changes-By: lintian-brush
Fixes: lintian: upstream-metadata-file-is-missing
See-also: https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html

- - - - -
ba52fcda by Pierre Gruet at 2022-08-22T22:27:46+02:00
Pointing URI to the Github repo in which the code now lies, adding a d/README.source file

- - - - -
3869f3cc by Pierre Gruet at 2022-08-22T22:28:02+02:00
Apply multi-arch hints.
+ libjgraph-java, libjgraph-java-doc: Add Multi-Arch: foreign.

Changes-By: apply-multiarch-hints

- - - - -
719b389a by Pierre Gruet at 2022-08-22T22:29:28+02:00
Updating changelog

- - - - -
affa8352 by Pierre Gruet at 2022-08-22T22:41:15+02:00
Refreshing d/README.source with information abouf libjgraphx-java

- - - - -
dcd070ca by Pierre Gruet at 2022-08-22T22:44:33+02:00
Correcting paths in the doc-base file

- - - - -
b02c7fd4 by Pierre Gruet at 2022-08-22T22:46:27+02:00
Removing duplicate documentation files

- - - - -
d126c0a7 by Pierre Gruet at 2022-08-22T22:52:03+02:00
Adding a Lintian override for the embedded Javascript

- - - - -
a3ddc7f6 by Pierre Gruet at 2022-08-22T22:52:39+02:00
Updating changelog

- - - - -
9102d54e by Pierre Gruet at 2022-08-22T23:04:07+02:00
Making the Lintian override more general

- - - - -
a0e736af by Pierre Gruet at 2022-08-23T07:06:12+02:00
Upload to unstable

- - - - -


13 changed files:

- + debian/README.source
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/libjgraph-java-doc.doc-base
- debian/libjgraph-java-doc.docs
- + debian/libjgraph-java-doc.lintian-overrides
- − debian/repack.local
- − debian/repack.stub
- debian/rules
- + debian/upstream/metadata
- debian/watch


Changes:

=====================================
debian/README.source
=====================================
@@ -0,0 +1,6 @@
+jgraph5 has been frozen and now lies in an inactive Github repository
+    https://github.com/jgraph/legacy-jgraph5
+
+The project which replaced it, JGraphX, already has its Debian package.
+
+ -- Pierre Gruet <pgt at debian.org>  Mon, 22 Aug 2022 22:26:51 +0200


=====================================
debian/changelog
=====================================
@@ -1,8 +1,35 @@
-libjgraph-java (5.12.4.2+dfsg-6) UNRELEASED; urgency=medium
+libjgraph-java (5.12.4.2+dfsg-6) unstable; urgency=medium
+
+  * Team upload
+  * Raising Standards version to 4.6.1:
+    - Using https form of copyright-format URI
+    - Priority extra is now optional
+    - Rules-Requires-Root: no
+    - Deleting unnecessary get-orig-source target in d/rules
+    - Repacking through Files-Excluded in d/copyright
+  * Renaming BSD-3 stanza to BSD-3-clause in d/copyright
+  * Raising d/watch version to 4, rewriting it a bit
+  * Depending on debhelper-compat 13, dropping d/compat
+  * Vcs-* fields now point to Salsa
+  * Set upstream metadata fields: Repository-Browse.
+  * Pointing URI to the Github repo in which the code now lies, adding
+    a d/README.source file
+  * Marking libjgraph-java and libjgraph-java-doc as Multi-Arch: foreign
+  * Correcting paths in the doc-base file
+  * Removing duplicate documentation files
+  * Adding a Lintian override for the embedded Javascript
 
+  [ gregor herrmann ]
   * Remove myself from Uploaders.
 
- -- gregor herrmann <gregoa at debian.org>  Fri, 20 Aug 2021 03:31:31 +0200
+ -- Pierre Gruet <pgt at debian.org>  Mon, 22 Aug 2022 23:04:17 +0200
+
+libjgraph-java (5.12.4.2+dfsg-5.1) unstable; urgency=medium
+
+  * Non maintainer upload by the Reproducible Builds team.
+  * No source change upload to rebuild on buildd with .buildinfo files.
+
+ -- Holger Levsen <holger at debian.org>  Sat, 02 Jan 2021 01:37:55 +0100
 
 libjgraph-java (5.12.4.2+dfsg-5) unstable; urgency=medium
 


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


=====================================
debian/control
=====================================
@@ -2,19 +2,21 @@ Source: libjgraph-java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill at debian.org>
 Section: java
-Priority: extra
+Priority: optional
 Build-Depends: ant,
-               debhelper (>= 10),
+               debhelper-compat (= 13),
                default-jdk,
                maven-repo-helper
-Standards-Version: 3.9.8
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjgraph-java.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/libjgraph-java.git
-Homepage: https://github.com/jgraph/jgraphx
+Standards-Version: 4.6.1
+Vcs-Browser: https://salsa.debian.org/java-team/libjgraph-java
+Vcs-Git: https://salsa.debian.org/java-team/libjgraph-java.git
+Homepage: https://github.com/jgraph/legacy-jgraph5
+Rules-Requires-Root: no
 
 Package: libjgraph-java
 Architecture: all
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: JFC/Swing graph component for Java
  JGraph is an easy-to-use, feature-rich and standards-compliant open source
  graph component available for Java. Application areas include:
@@ -34,6 +36,7 @@ Package: libjgraph-java-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: JFC/Swing graph component for Java (documentation)
  JGraph is an easy-to-use, feature-rich and standards-compliant open source
  graph component available for Java.


=====================================
debian/copyright
=====================================
@@ -1,7 +1,8 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Gaudenz Adler
 Upstream-Name: JGraph
 Source: https://github.com/jgraph/legacy-jgraph5
+Files-Excluded: examples/org/jgraph/example/JGraphAbstractIconAnimator.java
 Comment:
  The file ./examples/org/jgraph/example/JGraphAbstractIconAnimator.java
  was removed from the upstream tarball because it has a non-free license..
@@ -34,7 +35,7 @@ License: public-domain
 Files: examples/org/jgraph/example/JGraphIconView.java
        examples/org/jgraph/example/IconExample.java
 Copyright: 2001-2004, Dean Mao All rights reserved.
-License: BSD-3
+License: BSD-3-clause
 
 Files: examples/com/jgraph/example/panelexample/PortLabelGraph.java
 Copyright: 2005, Gaudenz Alder
@@ -79,7 +80,7 @@ License: LGPL-2+
  On Debian systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-2'.
 
-License: BSD-3
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
   - Redistributions of source code must retain the above copyright notice,


=====================================
debian/libjgraph-java-doc.doc-base
=====================================
@@ -5,5 +5,5 @@ Abstract: API documentation for the JGraph Java library.
 Section: Programming/Java
 
 Format: HTML
-Index: /usr/share/doc/libjgraph-java-doc/api/index.html
-Files: /usr/share/doc/libjgraph-java-doc/api/*.html
+Index: /usr/share/doc/libjgraph-java/api/index.html
+Files: /usr/share/doc/libjgraph-java/api/*.html


=====================================
debian/libjgraph-java-doc.docs
=====================================
@@ -1,3 +1 @@
-README
-WHATSNEW
 build/doc/api


=====================================
debian/libjgraph-java-doc.lintian-overrides
=====================================
@@ -0,0 +1,4 @@
+# It would be too complicated to remove the javascript that is included in
+# javadocs, see the discussion on Debian Java mailing list starting at 
+# https://lists.debian.org/debian-java/2018/06/msg00020.html.
+embedded-javascript-library please use libjs-jquery* [usr/share/doc/libjgraph-java/api/*s]


=====================================
debian/repack.local deleted
=====================================
@@ -1,2 +0,0 @@
-requires_version 3
-rm examples/org/jgraph/example/JGraphAbstractIconAnimator.java


=====================================
debian/repack.stub deleted
=====================================
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-: <<=cut
-=pod
-
-=head1 NAME
-
-repack.stub - script to repack upstream tarballs from uscan
-
-=head1 INSTRUCTIONS
-
-put this in debian/repack.stub and add "debian sh debian/repack.stub" to
-the end of the line in debian/watch. you will also need to add a version
-mangle to debian/watch.
-
-then create a debian/repack.local. this is a shell script that is
-sourced under "set -e", so be careful to check returns codes.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=item rm
-
-rm is replaced by a function that does some magic ("rm -rv" by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item mv
-
-mv is replaced by a function that just does mv (by default), but also changes MANIFEST if $MANIFEST is 1
-
-=item requires_version
-
-requires_version is there for future usage for requiring certain versions of the script
-
-=back
-
-=head1 VARIABLES
-
-=over 4
-
-=item SUFFIX
-
-defaults to +dfsg
-
-what to append to the upstream version
-
-=item RM_OPTS
-
-defaults to -vrf
-
-options to pass to rm
-
-=item MANIFEST
-
-defaults to 0, set to 1 to turn on.
-
-this will manipulate MANIFEST files in CPAN tarballs.
-
-=item UP_BASE
-
-this is the directory where the upstream source is.
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2009, Ryan Niebur <ryan at debian.org>
-
-License: Artistic or GPL-1+
-
-=cut
-
-if [ -z "$REPACK_SH" ]; then
-    if [ -f ../../scripts/repack.sh ]; then
-        REPACK_SH=../../scripts/repack.sh
-    fi
-    if [ -z "$REPACK_SH" ] && which repack.sh > /dev/null; then
-        REPACK_SH=$(which repack.sh)
-    fi
-fi
-
-if [ ! -f "$REPACK_SH" ]; then
-    echo "Couldn't find a repack.sh. please put it in your PATH, put it at ../../scripts/repack.sh, or put it somewhere else and set the REPACK_SH variable"
-    echo "You can get it from http://anonscm.debian.org/gitweb/?p=pkg-perl/scripts.git;a=blob_plain;f=repack.sh;hb=HEAD"
-    exit 1
-fi
-
-exec "$REPACK_SH" "$@"


=====================================
debian/rules
=====================================
@@ -11,6 +11,3 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 	mh_install -plibjgraph-java
-
-get-orig-source:
-	uscan --force-download


=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1,2 @@
+---
+Repository-Browse: https://github.com/jgraph/legacy-jgraph5


=====================================
debian/watch
=====================================
@@ -1,3 +1,5 @@
-version=3
-opts=dversionmangle=s/\+dfsg$// \
-	http://www.jgraph.com/downloads/jgraph/archive/ jgraph-([\d\.]+)-lgpl-src\.jar debian sh debian/repack.stub
+version=4
+
+opts="dversionmangle=auto, \
+ filenamemangle=s%(?:.*?)?v?(\d[\d.]*@ARCHIVE_EXT@)%@PACKAGE at -$1%" \
+ https://github.com/jgraph/legacy-jgraph5/tags (?:.*?/)?v?@ANY_VERSION@@ARCHIVE_EXT@



View it on GitLab: https://salsa.debian.org/java-team/libjgraph-java/-/compare/5a304fecc590e31e96a0f3a244ae6cd1423f90af...a0e736af1c06e45fe85d4faa1f84812a934db8a5

-- 
View it on GitLab: https://salsa.debian.org/java-team/libjgraph-java/-/compare/5a304fecc590e31e96a0f3a244ae6cd1423f90af...a0e736af1c06e45fe85d4faa1f84812a934db8a5
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/20220823/28b78980/attachment.htm>


More information about the pkg-java-commits mailing list