[Git][java-team/janino][master] 28 commits: Import Upstream version 2.5.8

Andreas Tille (@tille) gitlab at salsa.debian.org
Mon Jan 27 17:35:38 GMT 2025



Andreas Tille pushed to branch master at Debian Java Maintainers / janino


Commits:
d2feaca4 by Andreas Tille at 2025-01-27T18:21:11+01:00
Import Upstream version 2.5.8
- - - - -
7f2c39c4 by Philipp Hagemeister at 2025-01-27T18:21:12+01:00
Import Debian changes 2.5.8-1

janino (2.5.8-1) unstable; urgency=low
.
  * Initial Debian packaging (Bug #432254)
  * Patched to remove static buildpaths from build.xml
  * Added a wrapper script for org.codehaus.janino.Compiler, called janinoc
  * Added a manpage

- - - - -
ddd2ec56 by Andreas Tille at 2025-01-27T18:21:13+01:00
Import Upstream version 2.5.9
- - - - -
c5ce8780 by Philipp Hagemeister at 2025-01-27T18:21:13+01:00
Import Debian changes 2.5.9-1

janino (2.5.9-1) unstable; urgency=low
.
  * New upstream version
  * Better description

- - - - -
4bffc6e1 by Andreas Tille at 2025-01-27T18:21:14+01:00
Import Upstream version 2.5.10
- - - - -
e61de398 by Philipp Hagemeister at 2025-01-27T18:21:14+01:00
Import Debian changes 2.5.10-1

janino (2.5.10-1) unstable; urgency=low
.
  * New upstream version

- - - - -
aa63fdef by Andreas Tille at 2025-01-27T18:21:15+01:00
Import Upstream version 2.5.11
- - - - -
a421c8ee by Philipp Hagemeister at 2025-01-27T18:21:16+01:00
Import Debian changes 2.5.11-1

janino (2.5.11-1) unstable; urgency=low
.
  * New upstream version

- - - - -
69ee42a2 by Andreas Tille at 2025-01-27T18:21:17+01:00
Import Upstream version 2.5.12
- - - - -
00aa33d8 by Philipp Hagemeister at 2025-01-27T18:21:17+01:00
Import Debian changes 2.5.12-1

janino (2.5.12-1) unstable; urgency=low
.
  * New upstream version
  * Removed a typo in debian/README.Debian
  * Updated Standards-Version to 3.7.3
  * Moved homepage from description to its own field
  * Corrected minus signs in manpage

- - - - -
5ef5c7bc by Andreas Tille at 2025-01-27T18:21:18+01:00
Import Upstream version 2.5.13
- - - - -
fdee07ca by Philipp Hagemeister at 2025-01-27T18:21:18+01:00
Import Debian changes 2.5.13-1

janino (2.5.13-1) unstable; urgency=low
.
  * New upstream version
  * Corrected additional incorrect hyphens in manpage

- - - - -
38669bac by Holger Levsen at 2025-01-27T18:21:20+01:00
Import Debian changes 2.7.0-2.1

janino (2.7.0-2.1) unstable; urgency=medium
.
  * Non maintainer upload by the Reproducible Builds team.
  * No source change upload to rebuild on buildd with .buildinfo files.
.
janino (2.7.0-2) unstable; urgency=medium
.
  * Team upload.
  * debian/control:
    - libjanino-java-doc is now a suggested dependency of libjanino-java
      instead of a strong dependency of janino
    - Accept java6-runtime-headless as an alternative JRE
    - Standards-Version updated to 3.9.6 (no changes)
  * Modified 02-remove-nullanalysis-annotations.patch to work around a line
    ending issue preventing the patch from applying properly when building.
.
janino (2.7.0-1) unstable; urgency=low
.
  * Team upload.
  * New upstream release
  * Build the source tarball from the upstream SVN repository
  * Use XZ compression for the upstream tarball
  * Use the upstream build system instead of javahelper
  * Install the Maven artifacts in /usr/share/maven-repo
  * Added commons-compiler.jar to the classpath defined in the manifests
    of janino.jar and commons-compiler-jdk.jar
  * Register the documentation with doc-base
  * debian/control: Changed the Section from libs to java
  * debian/watch: Updated the download page
.
janino (2.6.1-1) unstable; urgency=low
.
  * New upstream release:
    - d/rules: Override configure step to unzip *-src.zip.
    - d/rules: Also clean existing binary JAR files.
  * d/watch: Updated from sepwatch.
  * d/copyright: Update and use copyright-format 1.0.
  * Switch to dh 7 and javahelper:
    - d/ant.properties, d/patches/*: Dropped.
    - d/control: Drop cdbs.
    - d/javabuild: Build all 3 modules.
    - d/*.javadoc: Publish 'internal' Javadoc from javahelper.
    - d/*.jlibs: Install 3 modules into /usr/share/java.
    - d/*.manifest: Add Main-Class attribute to janino.jar.
    - d/rules: Call dh with javahelper.
  * Split janino package:
    - Move Javadoc to libjanino-java-doc package
    - Move /usr/share/java/janino.jar to libjanino-java package.
    - Only keep janinoc into janino package.
    - Adjust Depends / Conflicts to help migration.
.
janino (2.5.15-3) unstable; urgency=low
.
  * Upload to unstable.
  * d/control: Bump Standards-Version to 3.9.4 (no changes needed).
  * d/control: Use canonical URL for Vcs-* fields.
.
janino (2.5.15-2) experimental; urgency=low
.
  [ Jari Aalto ]
  * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
  * Update to Standards-Version to 3.9.3 and debhelper to 9.
.
  [ Damien Raude-Morvan ]
  * Transfer package to pkg-java team.
  * Add myself as Uploaders.
  * Merge patch from Jari Aalto. (Closes: #664347).
  * Merge changes from Ubuntu (Thierry Carrez):
    - Added debian/ant.properties to build java2-compatible code.
    - debian/control, debian/rules: Build-depend on default-jdk
  * d/control: Add ${misc:Depends} to binary packages.
  * d/contorl: Add Vcs-* headers for Git repository.
.
janino (2.5.15-1) unstable; urgency=low
.
  * New upstream version
  * Fix janinoc script to handle arguments containing white space correctly
  * Updated Standards-Version to 3.8.0
  * Removed unnecessary DOS-Unix line ending conversions

- - - - -
77ca4901 by Andreas Tille at 2025-01-27T18:23:07+01:00
Remove Damien Raude-Morvan from Uploaders (Thank you for your previous work on this package Damian)

- - - - -
56ef1733 by Andreas Tille at 2025-01-27T18:27:51+01:00
New Homepage at Github

- - - - -
08eb263e by Andreas Tille at 2025-01-27T18:29:53+01:00
Point watch file to Github

- - - - -
825b40ef by Andreas Tille at 2025-01-27T18:30:00+01:00
Standards-Version: 4.7.0 (routine-update)

- - - - -
ce647c3c by Andreas Tille at 2025-01-27T18:30:00+01:00
debhelper-compat 13 (routine-update)

- - - - -
759b8bcb by Andreas Tille at 2025-01-27T18:30:14+01:00
Reorder sequence of d/control fields by cme (routine-update)

- - - - -
4de00980 by Andreas Tille at 2025-01-27T18:30:14+01:00
Secure URI in copyright format (routine-update)

- - - - -
c5597dc9 by Andreas Tille at 2025-01-27T18:30:14+01:00
Drop useless get-orig-source target (routine-update)

- - - - -
8b03151d by Andreas Tille at 2025-01-27T18:30:14+01:00
Remove trailing whitespace in debian/changelog (routine-update)

- - - - -
0d3ad428 by Andreas Tille at 2025-01-27T18:30:14+01:00
Remove trailing whitespace in debian/rules (routine-update)

- - - - -
cc495dff by Andreas Tille at 2025-01-27T18:31:42+01:00
Do not parse d/changelog (routine-update)

- - - - -
08d0d8d6 by Andreas Tille at 2025-01-27T18:31:42+01:00
No tab in license text (routine-update)

- - - - -
1b466deb by Andreas Tille at 2025-01-27T17:31:43+00:00
Trim trailing whitespace.

Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html

- - - - -
3aa7ec3d by Andreas Tille at 2025-01-27T18:34:45+01:00
Fix day-of-week for changelog entries 2.5.11-1, 2.5.9-1.

Changes-By: lintian-brush
Fixes: lintian: debian-changelog-has-wrong-day-of-week
See-also: https://lintian.debian.org/tags/debian-changelog-has-wrong-day-of-week.html

- - - - -
ba037143 by Andreas Tille at 2025-01-27T18:35:26+01:00
d/copyright: Fix license name

- - - - -


6 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- debian/rules
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,33 @@
+janino (2.7.0-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Remove Damien Raude-Morvan from Uploaders (Thank you for your previous
+    work on this package Damian)
+    Closes: #889349
+  * New Homepage at Github
+  * Point watch file to Github
+  * Standards-Version: 4.7.0 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Reorder sequence of d/control fields by cme (routine-update)
+  * Secure URI in copyright format (routine-update)
+  * Drop useless get-orig-source target (routine-update)
+  * Remove trailing whitespace in debian/changelog (routine-update)
+  * Remove trailing whitespace in debian/rules (routine-update)
+  * Do not parse d/changelog (routine-update)
+  * No tab in license text (routine-update)
+  * Trim trailing whitespace.
+  * Fix day-of-week for changelog entries 2.5.11-1, 2.5.9-1.
+  * d/copyright: Fix license name
+
+ -- Andreas Tille <tille at debian.org>  Mon, 27 Jan 2025 18:21:57 +0100
+
+janino (2.7.0-2.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>  Mon, 28 Dec 2020 11:45:28 +0100
+
 janino (2.7.0-2) unstable; urgency=medium
 
   * Team upload.
@@ -32,7 +62,7 @@ janino (2.6.1-1) unstable; urgency=low
   * New upstream release:
     - d/rules: Override configure step to unzip *-src.zip.
     - d/rules: Also clean existing binary JAR files.
-  * d/watch: Updated from sepwatch. 
+  * d/watch: Updated from sepwatch.
   * d/copyright: Update and use copyright-format 1.0.
   * Switch to dh 7 and javahelper:
     - d/ant.properties, d/patches/*: Dropped.
@@ -106,7 +136,7 @@ janino (2.5.11-1) unstable; urgency=low
 
   * New upstream version
 
- -- Philipp Hagemeister <ubuntu at phihag.de>  Thu, 09 Nov 2007 23:58:47 +0200
+ -- Philipp Hagemeister <ubuntu at phihag.de>  Fri, 09 Nov 2007 23:58:47 +0200
 
 janino (2.5.10-1) unstable; urgency=low
 
@@ -119,7 +149,7 @@ janino (2.5.9-1) unstable; urgency=low
   * New upstream version
   * Better description
 
- -- Philipp Hagemeister <ubuntu at phihag.de>  Tue, 08 Aug 2007 21:07:02 +0200
+ -- Philipp Hagemeister <ubuntu at phihag.de>  Wed, 08 Aug 2007 21:07:02 +0200
 
 janino (2.5.8-1) unstable; urgency=low
 


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


=====================================
debian/control
=====================================
@@ -1,19 +1,23 @@
 Source: janino
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Philipp Hagemeister <ubuntu at phihag.de>
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Philipp Hagemeister <ubuntu at phihag.de>,
-           Damien Raude-Morvan <drazzib at debian.org>
-Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), javahelper, maven-repo-helper
-Build-Depends-Indep: ant, default-jdk, unzip
-Homepage: http://janino.net
-Vcs-Git: git://anonscm.debian.org/pkg-java/janino.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/janino.git
+Build-Depends: debhelper-compat (= 13),
+               javahelper,
+               maven-repo-helper
+Build-Depends-Indep: ant,
+                     default-jdk,
+                     unzip
+Standards-Version: 4.7.0
+Vcs-Browser: https://salsa.debian.org/java-team/janino
+Vcs-Git: https://salsa.debian.org/java-team/janino.git
+Homepage: https://janino-compiler.github.io/janino/
 
 Package: janino
 Architecture: all
-Depends: libjanino-java, ${misc:Depends}
+Depends: libjanino-java,
+         ${misc:Depends}
 Recommends: default-jre-headless | java6-runtime-headless
 Description: runtime compiler for Java expressions - binary
  Janino is a compiler that reads a Java expression, block, class body,
@@ -28,8 +32,6 @@ Package: libjanino-java
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: libjanino-java-doc
-Replaces: janino (<< 2.6.1-1~)
-Breaks: janino (<< 2.6.1-1~)
 Description: runtime compiler for Java expressions - library
  Janino is a compiler that reads a Java expression, block, class body,
  source file or a set of source files, and generates Java bytecode that is
@@ -40,11 +42,9 @@ Description: runtime compiler for Java expressions - library
  This package contains Java library.
 
 Package: libjanino-java-doc
-Section: doc
 Architecture: all
+Section: doc
 Depends: ${misc:Depends}
-Replaces: janino (<< 2.6.1-1~)
-Breaks: janino (<< 2.6.1-1~)
 Description: runtime compiler for Java expressions - documentation
  Janino is a compiler that reads a Java expression, block, class body,
  source file or a set of source files, and generates Java bytecode that is


=====================================
debian/copyright
=====================================
@@ -1,32 +1,31 @@
-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-Name: Janino
 Upstream-Contact: Arno Unkrig <arno at unkrig.de>
-Source: http://janino.net/changelog.html
+Source: https://github.com/janino-compiler/janino
 
 Files: *
 Copyright: 2001-2013, Arno Unkrig
-License: BSD-3-clauses
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2007, Philipp Hagemeister <ubuntu at phihag.de>
            2012-2013, Damien Raude-Morvan <drazzib at debian.org>
-License: BSD-3-clauses
+License: BSD-3-clause
 
-
-License: BSD-3-clauses
+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:
   .
     1. Redistributions of source code must retain the above copyright
-	notice, this list of conditions and the following disclaimer.
+        notice, this list of conditions and the following disclaimer.
     2. Redistributions in binary form must reproduce the above
-	copyright notice, this list of conditions and the following
-	disclaimer in the documentation and/or other materials
-	provided with the distribution.
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.
     3. The name of the author may not be used to endorse or promote
-	products derived from this software without specific prior
-	written permission.
+        products derived from this software without specific prior
+        written permission.
   .
   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED


=====================================
debian/rules
=====================================
@@ -2,7 +2,7 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+include /usr/share/dpkg/default.mk
 
 %:
 	dh $@ --buildsystem ant
@@ -11,20 +11,17 @@ override_dh_auto_build:
 	dh_auto_build -- -buildfile janino-dist/build.xml build
 
 override_dh_auto_install:
-	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(VERSION) commons-compiler/pom.xml
-	mh_installjar -plibjanino-java --java-lib -e$(VERSION) commons-compiler/pom.xml janino-dist/build/commons-compiler.jar
-	
-	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(VERSION) commons-compiler-jdk/pom.xml
-	mh_installjar -plibjanino-java --java-lib -e$(VERSION) commons-compiler-jdk/pom.xml janino-dist/build/commons-compiler-jdk.jar
-	
-	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(VERSION) janino/pom.xml
-	mh_installjar -plibjanino-java --java-lib -e$(VERSION) janino/pom.xml janino-dist/build/janino.jar
-	
+	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(DEB_VERSION_UPSTREAM) commons-compiler/pom.xml
+	mh_installjar -plibjanino-java --java-lib -e$(DEB_VERSION_UPSTREAM) commons-compiler/pom.xml janino-dist/build/commons-compiler.jar
+
+	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(DEB_VERSION_UPSTREAM) commons-compiler-jdk/pom.xml
+	mh_installjar -plibjanino-java --java-lib -e$(DEB_VERSION_UPSTREAM) commons-compiler-jdk/pom.xml janino-dist/build/commons-compiler-jdk.jar
+
+	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(DEB_VERSION_UPSTREAM) janino/pom.xml
+	mh_installjar -plibjanino-java --java-lib -e$(DEB_VERSION_UPSTREAM) janino/pom.xml janino-dist/build/janino.jar
+
 	jh_manifest -plibjanino-java
 
 override_dh_auto_clean:
 	-rm -rf janino-dist/build janino-dist/mirror
 	mh_clean
-
-get-orig-source::
-	uscan --force-download


=====================================
debian/watch
=====================================
@@ -1,2 +1,4 @@
-version=3
-http://janino.net/changelog.html .*janino-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)|zip) debian debian/orig-tar.sh
+version=4
+
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE at -$1.tar.gz%" \
+   https://github.com/janino-compiler/janino/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz



View it on GitLab: https://salsa.debian.org/java-team/janino/-/compare/fc4825b29e35e05103f963040662ad1327d99bd7...ba03714308c5c58a3f4651d802163726c11a69cf

-- 
View it on GitLab: https://salsa.debian.org/java-team/janino/-/compare/fc4825b29e35e05103f963040662ad1327d99bd7...ba03714308c5c58a3f4651d802163726c11a69cf
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/20250127/991c3f66/attachment.htm>


More information about the pkg-java-commits mailing list