[Git][java-team/libcommons-collections3-java] Pushed new tag debian/3.2.2-3

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed new tag debian/3.2.2-3 at Debian Java Maintainers / 
libcommons-collections3-java

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/tree/debian/3.2.2-3
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits


[Git][java-team/libcommons-collections3-java][master] Prepare changelog for upload

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed to branch master at Debian Java Maintainers / 
libcommons-collections3-java


Commits:
3cbe22a1 by tony mancill at 2024-01-24T23:34:37-08:00
Prepare changelog for upload

- - - - -


1 changed file:

- debian/changelog


Changes:

=
debian/changelog
=
@@ -1,5 +1,6 @@
-libcommons-collections3-java (3.2.2-3) UNRELEASED; urgency=medium
+libcommons-collections3-java (3.2.2-3) unstable; urgency=medium
 
+  * Team upload
   [ Vladimir Petko ]
   * Use java_compat_level variable provided by java-common to set Java
 release level (Closes: #1057517).
@@ -14,6 +15,7 @@ libcommons-collections3-java (3.2.2-3) UNRELEASED; 
urgency=medium
   * Use secure URI in Homepage field.
   * Bump debhelper from old 11 to 13.
   * Set debhelper-compat version in Build-Depends.
+  * Binary packages are now Multi-Arch: foreign
 
  -- Vladimir Petko   Thu, 25 Jan 2024 16:05:04 
+1300
 



View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/commit/3cbe22a1f408ab3428c33ff54f27e5fb0847807a

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/commit/3cbe22a1f408ab3428c33ff54f27e5fb0847807a
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits


[Git][java-team/libcommons-collections3-java][master] 4 commits: Use java_compat_level variable provided by java-common to set Java release level.

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed to branch master at Debian Java Maintainers / 
libcommons-collections3-java


Commits:
04866f03 by Vladimir Petko at 2024-01-25T16:04:12+13:00
Use java_compat_level variable provided by java-common to set Java release 
level.

- - - - -
fca6f628 by Vladimir Petko at 2024-01-25T16:09:16+13:00
changelog

- - - - -
a2e72571 by Tony Mancill at 2024-01-25T06:32:41+00:00
Merge branch master into master

fix-up changelog after rebasing

# Conflicts:
#   debian/changelog
- - - - -
e19a4b25 by Tony Mancill at 2024-01-25T06:41:08+00:00
Merge branch master into master

Resolve Java 21 FTBFS

See merge request java-team/libcommons-collections3-java!4
- - - - -


3 changed files:

- debian/changelog
- debian/patches/java11-compatibility.patch
- debian/rules


Changes:

=
debian/changelog
=
@@ -1,5 +1,10 @@
 libcommons-collections3-java (3.2.2-3) UNRELEASED; urgency=medium
 
+  [ Vladimir Petko ]
+  * Use java_compat_level variable provided by java-common to set Java
+release level (Closes: #1057517).
+
+  [ Debian Janitor ]
   * Remove constraints unnecessary since buster (oldstable):
 + libcommons-collections3-java: Drop conflict with removed package
   libjson-java (<= 2.3-2) in Breaks.
@@ -10,7 +15,7 @@ libcommons-collections3-java (3.2.2-3) UNRELEASED; 
urgency=medium
   * Bump debhelper from old 11 to 13.
   * Set debhelper-compat version in Build-Depends.
 
- -- Debian Janitor   Thu, 22 Dec 2022 11:09:43 -
+ -- Vladimir Petko   Thu, 25 Jan 2024 16:05:04 
+1300
 
 libcommons-collections3-java (3.2.2-2) unstable; urgency=medium
 


=
debian/patches/java11-compatibility.patch
=
@@ -3,11 +3,19 @@ Author: Emmanuel Bourg 
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -269,6 +269,7 @@
+@@ -125,6 +125,7 @@
+ 
+ 
+@@ -269,6 +270,7 @@
  



=
debian/rules
=
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/dpkg/pkg-info.mk
+include /usr/share/java/java_defaults.mk
 
 LAST_MODIFIED:= $(shell date +%s%N | cut -c -13)
 
@@ -8,7 +9,7 @@ LAST_MODIFIED:= $(shell date +%s%N | cut -c -13)
dh $@ --with maven-repo-helper
 
 override_dh_auto_build:
-   dh_auto_build -- jar javadoc -Dlastmodified=$(LAST_MODIFIED) 
-Dant.build.javac.source=6 -Dant.build.javac.target=6
+   dh_auto_build -- jar javadoc -Dlastmodified=$(LAST_MODIFIED) 
-Djavac.release=$(java_compat_level)
 
 override_dh_auto_install:
mh_installpoms -plibcommons-collections3-java



View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/17fd4c3c7d1950e01ee971ec84f78803e4f1bac7...e19a4b25dec34d54ffb2f989eb5b5dfe1ccfada7

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/17fd4c3c7d1950e01ee971ec84f78803e4f1bac7...e19a4b25dec34d54ffb2f989eb5b5dfe1ccfada7
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits


[Git][java-team/libcommons-collections3-java][master] 2 commits: Apply multi-arch hints

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed to branch master at Debian Java Maintainers / 
libcommons-collections3-java


Commits:
c70f0250 by Janitor at 2024-01-25T06:30:17+00:00
Apply multi-arch hints

- - - - -
17fd4c3c by Tony Mancill at 2024-01-25T06:30:17+00:00
Merge branch multiarch-fixes into master

Apply multi-arch hints

See merge request java-team/libcommons-collections3-java!3
- - - - -


1 changed file:

- debian/control


Changes:

=
debian/control
=
@@ -24,6 +24,7 @@ Depends: ${misc:Depends}
 Suggests: libcommons-collections3-java-doc
 Breaks:
  jenkins-json (<= 2.4-jenkins-3-1)
+Multi-Arch: foreign
 Description: Apache Commons Collections - Extended Collections API for Java
  The Java Collections Framework was a major addition in JDK 1.2. It added many
  powerful data structures that accelerate development of most significant Java
@@ -54,6 +55,7 @@ Package: libcommons-collections3-java-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
+Multi-Arch: foreign
 Description: Documentation for libcommons-collections3-java
  Javadocs for libcommons-collections3-java which is a Java
  collection framework.



View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/3191539364e468c28d58d5561d2e38296c9f52be...17fd4c3c7d1950e01ee971ec84f78803e4f1bac7

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/3191539364e468c28d58d5561d2e38296c9f52be...17fd4c3c7d1950e01ee971ec84f78803e4f1bac7
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits


[Git][java-team/libcommons-collections3-java][master] 2 commits: Remove unnecessary constraints

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed to branch master at Debian Java Maintainers / 
libcommons-collections3-java


Commits:
eda3301d by Janitor at 2024-01-25T06:26:00+00:00
Remove unnecessary constraints

- - - - -
31915393 by Tony Mancill at 2024-01-25T06:26:01+00:00
Merge branch scrub-obsolete into master

Remove unnecessary constraints

See merge request java-team/libcommons-collections3-java!2
- - - - -


2 changed files:

- debian/changelog
- debian/control


Changes:

=
debian/changelog
=
@@ -1,5 +1,8 @@
 libcommons-collections3-java (3.2.2-3) UNRELEASED; urgency=medium
 
+  * Remove constraints unnecessary since buster (oldstable):
++ libcommons-collections3-java: Drop conflict with removed package
+  libjson-java (<= 2.3-2) in Breaks.
   * Trim trailing whitespace.
   * Use secure copyright file specification URI.
   * Update watch file format version to 4.
@@ -7,7 +10,7 @@ libcommons-collections3-java (3.2.2-3) UNRELEASED; 
urgency=medium
   * Bump debhelper from old 11 to 13.
   * Set debhelper-compat version in Build-Depends.
 
- -- Debian Janitor   Wed, 21 Dec 2022 09:59:36 -
+ -- Debian Janitor   Thu, 22 Dec 2022 11:09:43 -
 
 libcommons-collections3-java (3.2.2-2) unstable; urgency=medium
 


=
debian/control
=
@@ -23,8 +23,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Suggests: libcommons-collections3-java-doc
 Breaks:
- jenkins-json (<= 2.4-jenkins-3-1),
- libjson-java (<= 2.3-2)
+ jenkins-json (<= 2.4-jenkins-3-1)
 Description: Apache Commons Collections - Extended Collections API for Java
  The Java Collections Framework was a major addition in JDK 1.2. It added many
  powerful data structures that accelerate development of most significant Java



View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/279e54214cfb5cc15e755c08887aa217d1a13d53...3191539364e468c28d58d5561d2e38296c9f52be

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/libcommons-collections3-java/-/compare/279e54214cfb5cc15e755c08887aa217d1a13d53...3191539364e468c28d58d5561d2e38296c9f52be
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits


[Git][java-team/libcommons-collections3-java][master] 7 commits: Trim trailing whitespace.

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed to branch master at Debian Java Maintainers / 
libcommons-collections3-java


Commits:
cc6288db by Debian Janitor at 2022-12-21T09:59:36+00:00
Trim trailing whitespace.

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

- - - - -
26fea246 by Debian Janitor at 2022-12-21T09:59:37+00:00
Use secure copyright file specification URI.

Changes-By: lintian-brush
Fixes: lintian: insecure-copyright-format-uri
See-also: https://lintian.debian.org/tags/insecure-copyright-format-uri.html

- - - - -
f149766a by Debian Janitor at 2022-12-21T09:59:38+00:00
Update watch file format version to 4.

Changes-By: lintian-brush
Fixes: lintian: older-debian-watch-file-standard
See-also: https://lintian.debian.org/tags/older-debian-watch-file-standard.html

- - - - -
d310dae7 by Debian Janitor at 2022-12-21T09:59:41+00:00
Use secure URI in Homepage field.

Changes-By: lintian-brush
Fixes: lintian: homepage-field-uses-insecure-uri
See-also: https://lintian.debian.org/tags/homepage-field-uses-insecure-uri.html

- - - - -
a6c7effb by Debian Janitor at 2022-12-21T09:59:43+00:00
Bump debhelper from old 11 to 13.

Changes-By: lintian-brush
Fixes: lintian: package-uses-old-debhelper-compat-version
See-also: 
https://lintian.debian.org/tags/package-uses-old-debhelper-compat-version.html

- - - - -
72a06889 by Debian Janitor at 2022-12-21T09:59:43+00:00
Set debhelper-compat version in Build-Depends.

Changes-By: lintian-brush
Fixes: lintian: uses-debhelper-compat-file
See-also: https://lintian.debian.org/tags/uses-debhelper-compat-file.html

- - - - -
279e5421 by Tony Mancill at 2024-01-25T06:20:57+00:00
Merge branch lintian-fixes into master

Fix some issues reported by lintian

See merge request java-team/libcommons-collections3-java!1
- - - - -


5 changed files:

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


Changes:

=
debian/changelog
=
@@ -1,3 +1,14 @@
+libcommons-collections3-java (3.2.2-3) UNRELEASED; urgency=medium
+
+  * Trim trailing whitespace.
+  * Use secure copyright file specification URI.
+  * Update watch file format version to 4.
+  * Use secure URI in Homepage field.
+  * Bump debhelper from old 11 to 13.
+  * Set debhelper-compat version in Build-Depends.
+
+ -- Debian Janitor   Wed, 21 Dec 2022 09:59:36 -
+
 libcommons-collections3-java (3.2.2-2) unstable; urgency=medium
 
   * Fixed the build failure with Java 11 (Closes: #912515)
@@ -76,7 +87,7 @@ libcommons-collections3-java (3.2.1-3) experimental; 
urgency=low
   * Use mh_installpom and mh_installjar to install the POM and the jar to the
 Maven repository
   * Add ${misc:Depends} to Depends to clear Lintian warnings
-  * Patch src/conf/MANIFEST.MF: add the OSGi metadata generated by the Maven 
+  * Patch src/conf/MANIFEST.MF: add the OSGi metadata generated by the Maven
 build, use quilt
   * Fix Lintian warning: Remove full text of Apache license
 
@@ -155,7 +166,7 @@ libcommons-collections3-java (3.1a-2) unstable; urgency=low
  -- Wolfgang Baer   Fri,  6 Jan 2006 19:53:47 +0100
 
 libcommons-collections3-java (3.1a-1) unstable; urgency=low
-  
+
   * Moved package to pkg-java-maintainers
   * Cleaned upstream tarball which contained the debian
 directory and all file after a build - added an 'a'
@@ -167,7 +178,7 @@ libcommons-collections3-java (3.1a-1) unstable; urgency=low
   * Build apidocs and register with doc-base
   * Drop gjdoc patch - not needed anymore
   * Added myself to uploaders
-  * Standards-Version 3.6.2 (no changes)  
+  * Standards-Version 3.6.2 (no changes)
 
  -- Wolfgang Baer   Sun, 25 Sep 2005 02:44:13 +0200
 


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


=
debian/control
=
@@ -8,7 +8,7 @@ Uploaders:
 Build-Depends:
  ant,
  ant-optional,
- debhelper (>= 11),
+ debhelper-compat (= 13),
  default-jdk,
  default-jdk-doc,
  junit,
@@ -16,7 +16,7 @@ Build-Depends:
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/libcommons-collections3-java.git
 Vcs-Browser: https://salsa.debian.org/java-team/libcommons-collections3-java
-Homepage: http://commons.apache.org/collections/
+Homepage: https://commons.apache.org/collections/
 
 Package: libcommons-collections3-java
 Architecture: all


=
debian/copyright
=
@@ -1,4 +1,4 @@
-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: Apache Commons Collections
 Upstream-Contact: Apache Commons Developers 
 Source: http://commons.apache.org/collections/


=
debian/watch

[Git][java-team/jmagick] Pushed new tag debian/6.6.9_20130201-svn99-5

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed new tag debian/6.6.9_20130201-svn99-5 at Debian Java 
Maintainers / jmagick

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/jmagick/-/tree/debian/6.6.9_20130201-svn99-5
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits


[Git][java-team/jmagick][master] Prepare changelog for upload

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed to branch master at Debian Java Maintainers / jmagick


Commits:
81f3ebe7 by tony mancill at 2024-01-24T20:22:49-08:00
Prepare changelog for upload

- - - - -


1 changed file:

- debian/changelog


Changes:

=
debian/changelog
=
@@ -1,5 +1,6 @@
-jmagick (6.6.9~20130201-svn99-5) UNRELEASED; urgency=medium
+jmagick (6.6.9~20130201-svn99-5) unstable; urgency=medium
 
+  * Team upload
   * d/rules: use java_compat_level variable provided by java-common to
 set Java release level (Closes: #1057510).
 
@@ -186,4 +187,3 @@ jmagick (6.0.4-0-1) unstable; urgency=low
   * Initial release.
 
  -- Adam Heath   Wed, 17 Aug 2005 14:27:52 -0500
-



View it on GitLab: 
https://salsa.debian.org/java-team/jmagick/-/commit/81f3ebe763924fa7f67cd9fc1546294a98c485d5

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/jmagick/-/commit/81f3ebe763924fa7f67cd9fc1546294a98c485d5
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits


[Git][java-team/jmagick][master] 3 commits: Use java_compat_level variable provided by java-common to set the release.

2024-01-24 Thread Tony Mancill (@tmancill)


Tony Mancill pushed to branch master at Debian Java Maintainers / jmagick


Commits:
9baf55cb by Vladimir Petko at 2024-01-25T14:50:31+13:00
Use java_compat_level variable provided by java-common to set the release.

- - - - -
cce96da5 by Vladimir Petko at 2024-01-25T14:59:27+13:00
changelog

- - - - -
a057aa94 by Tony Mancill at 2024-01-25T03:57:31+00:00
Merge branch master into master

Resolve Java 21 ftbfs

See merge request java-team/jmagick!1
- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=
debian/changelog
=
@@ -1,3 +1,10 @@
+jmagick (6.6.9~20130201-svn99-5) UNRELEASED; urgency=medium
+
+  * d/rules: use java_compat_level variable provided by java-common to
+set Java release level (Closes: #1057510).
+
+ -- Vladimir Petko   Thu, 25 Jan 2024 14:50:47 
+1300
+
 jmagick (6.6.9~20130201-svn99-4) unstable; urgency=medium
 
   * Team upload.


=
debian/rules
=
@@ -5,6 +5,7 @@ JAVA_HOME   := /usr/lib/jvm/default-java
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/makefile.mk
+include /usr/share/java/java_defaults.mk
 
 CC=gcc
 DEB_CONFIGURE_SCRIPT_ENV += PATH=$(JAVA_HOME)/bin:$$PATH
@@ -19,7 +20,7 @@ DEB_INSTALL_CHANGELOGS_ALL := Changelog.txt
 DEB_AUTO_UPDATE_AUTOCONF := yes
 VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^~-]+).*,\1,p')
 
-export JFLAGS = --release 7 -g
+export JFLAGS = --release $(java_compat_level) -g
 
 install/libjmagick6-java::
mh_install



View it on GitLab: 
https://salsa.debian.org/java-team/jmagick/-/compare/fa685029b87e983028b3b00704aa4ba75e3ecbc6...a057aa94f49dd71a6648479e108671f778ad090f

-- 
View it on GitLab: 
https://salsa.debian.org/java-team/jmagick/-/compare/fa685029b87e983028b3b00704aa4ba75e3ecbc6...a057aa94f49dd71a6648479e108671f778ad090f
You're receiving this email because of your account on salsa.debian.org.


___
pkg-java-commits mailing list
pkg-java-comm...@alioth-lists.debian.net
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits