[Git][java-team/libjibx1.2-java][master] 6 commits: Marking the -doc package as Multi-Arch: foreign
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Sun Jan 26 08:00:05 GMT 2025
Pierre Gruet pushed to branch master at Debian Java Maintainers / libjibx1.2-java
Commits:
f61993c4 by Pierre Gruet at 2025-01-24T22:51:16+01:00
Marking the -doc package as Multi-Arch: foreign
- - - - -
eb26db6b by Pierre Gruet at 2025-01-25T15:22:36+01:00
Build-depending on the headless JDK only
- - - - -
aa76a88e by Pierre Gruet at 2025-01-25T15:23:32+01:00
Using javahelper to design the classpath of the built jars
- - - - -
7055b94e by Pierre Gruet at 2025-01-25T15:23:55+01:00
Alleviating debian/rules
- - - - -
e5a56417 by Pierre Gruet at 2025-01-26T08:58:53+01:00
Using maven-repo-helper to provide Maven artifacts, hence simplifying debian/rules
- - - - -
79a003c0 by Pierre Gruet at 2025-01-26T08:59:56+01:00
Updating changelog
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/libjibx1.2-java.classpath
- debian/libjibx1.2-java.poms
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
libjibx1.2-java (1.2.6-3) UNRELEASED; urgency=medium
+ [ Andreas Tille ]
* Team upload.
* Fix Homepage
* Fix Vcs fields
@@ -9,8 +10,16 @@ libjibx1.2-java (1.2.6-3) UNRELEASED; urgency=medium
* Standards-Version: 4.7.0 (routine-update)
* Drop useless get-orig-source target (routine-update)
* Trim trailing whitespace.
+ * Switchinig from cdbs to dh
- -- Andreas Tille <tille at debian.org> Thu, 23 Jan 2025 19:56:18 +0100
+ [ Pierre Gruet ]
+ * Marking the -doc package as Multi-Arch: foreign
+ * Build-depending on the headless JDK only
+ * Using javahelper to design the classpath of the built jars
+ * Using maven-repo-helper to provide Maven artifacts, hence simplifying
+ debian/rules
+
+ -- Pierre Gruet <pgt at debian.org> Sun, 26 Jan 2025 08:58:59 +0100
libjibx1.2-java (1.2.6-2) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -6,7 +6,8 @@ Section: java
Priority: optional
Build-Depends: ant,
debhelper-compat (= 13),
- default-jdk,
+ default-jdk-headless,
+ javahelper,
maven-repo-helper
Build-Depends-Indep: libbcel-java,
libjoda-time-java,
@@ -19,8 +20,7 @@ Homepage: https://jibx.sourceforge.io/
Package: libjibx1.2-java
Architecture: all
-Depends: libbcel-java,
- libxpp3-java,
+Depends: ${java:Depends},
${misc:Depends}
Suggests: libjibx-java-doc
Description: Framework for binding XML data to Java objects
@@ -49,6 +49,7 @@ Description: Framework for binding XML data to Java objects (symlink)
Package: libjibx1.2-java-doc
Architecture: all
Section: doc
+Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: libjibx-java
Description: Framework for binding XML data to Java objects (documentation)
=====================================
debian/libjibx1.2-java.classpath
=====================================
@@ -0,0 +1,7 @@
+usr/share/java/jibx-bind.jar /usr/share/java/bcel.jar /usr/share/java/jibx-run.jar /usr/share/java/log4j-1.2.jar
+
+usr/share/java/jibx-extras.jar /usr/share/java/dom4j.jar /usr/share/java/jdom1.jar /usr/share/java/jibx-run.jar /usr/share/java/xpp3.jar
+
+usr/share/java/jibx-run.jar /usr/share/java/joda-time.jar /usr/share/java/xpp3.jar
+
+usr/share/java/jibx-schema.jar /usr/share/java/jibx-bind.jar /usr/share/java/jibx-extras.jar /usr/share/java/jibx-run.jar /usr/share/java/log4j-1.2.jar /usr/share/java/xpp3.jar
=====================================
debian/libjibx1.2-java.poms
=====================================
@@ -1,5 +1,31 @@
-debian/jibx-run.pom --has-package-version --no-parent
-debian/jibx-bind.pom --has-package-version --no-parent
-debian/jibx-extras.pom --has-package-version --no-parent
-debian/jibx-run.pom --has-package-version --no-parent
-debian/jibx-schema.pom --has-package-version --no-parent
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+debian/jibx-bind.pom --has-package-version --no-parent --artifact=lib/jibx-bind-*.jar --java-lib
+debian/jibx-extras.pom --has-package-version --no-parent --artifact=lib/jibx-extras-*.jar --java-lib
+debian/jibx-run.pom --has-package-version --no-parent --artifact=lib/jibx-run-*.jar --java-lib
+debian/jibx-schema.pom --has-package-version --no-parent --artifact=lib/jibx-schema-*.jar --java-lib
=====================================
debian/rules
=====================================
@@ -1,45 +1,21 @@
#!/usr/bin/make -f
-include /usr/share/dpkg/default.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j-1.2 qdox xpp3 joda-time
-DEB_ANT_BUILD_TARGET := setrelease current devdoc
-DEB_ANT_ARGS := -Dbindname=jibx-bind-$(DEB_VERSION_UPSTREAM) -Dextrasname=jibx-extras-$(DEB_VERSION_UPSTREAM) -Drunname=jibx-run-$(DEB_VERSION_UPSTREAM) -Dschemaname=jibx-schema-$(DEB_VERSION_UPSTREAM)
-DEB_BUILDDIR := build
-DEB_VERSION_UPSTREAM_2 := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -f1,2 -d. )
+include /usr/share/dpkg/pkg-info.mk
%:
- dh $@ --with javahelper
+ dh $@ --with javahelper,maven-repo-helper
override_dh_clean:
dh_clean
-rm -fr build/api build/classes lib/*
override_dh_auto_build:
- cd build && /usr/lib/jvm/default-java/bin/java -classpath /usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/java/bcel.jar:/ usr/share/java/log4j-1.2.jar:/usr/share/java/xpp3.jar:/usr/share/java/joda-time.jar:/usr/lib/jvm/default-java/lib/tools.jar -Dant.home=/usr/share/ant org.apache.tools.ant.Main - Dbindname=jibx-bind-1.2.6 -Dextrasname=jibx-extras-1.2.6 -Drunname=jibx-run-1.2.6 -Dschemaname=jibx-schema-1.2.6 setrelease current devdoc
-
-override_dh_install:
- dh_install
- mh_installpoms -plibjibx$(DEB_VERSION_UPSTREAM_2)-java
- mh_installjar -plibjibx$(DEB_VERSION_UPSTREAM_2)-java --usj-version=$(DEB_VERSION_UPSTREAM) --java-lib --no-usj-versionless debian/jibx-run.pom lib/jibx-run-$(DEB_VERSION_UPSTREAM).jar
- mh_installjar -plibjibx$(DEB_VERSION_UPSTREAM_2)-java --usj-version=$(DEB_VERSION_UPSTREAM) --java-lib --no-usj-versionless debian/jibx-bind.pom lib/jibx-bind-$(DEB_VERSION_UPSTREAM).jar
- mh_installjar -plibjibx$(DEB_VERSION_UPSTREAM_2)-java --usj-version=$(DEB_VERSION_UPSTREAM) --java-lib --no-usj-versionless debian/jibx-extras.pom lib/jibx-extras-$(DEB_VERSION_UPSTREAM).jar
- mh_installjar -plibjibx$(DEB_VERSION_UPSTREAM_2)-java --usj-version=$(DEB_VERSION_UPSTREAM) --java-lib --no-usj-versionless debian/jibx-schema.pom lib/jibx-schema-$(DEB_VERSION_UPSTREAM).jar
- if [ "$(DEB_VERSION_UPSTREAM)" != "$(DEB_VERSION_UPSTREAM_2)" ]; then \
- dh_link -plibjibx$(DEB_VERSION_UPSTREAM_2)-java usr/share/java/jibx-bind-$(DEB_VERSION_UPSTREAM).jar \
- usr/share/java/jibx-bind-$(DEB_VERSION_UPSTREAM_2).jar ; \
- dh_link -plibjibx$(DEB_VERSION_UPSTREAM_2)-java usr/share/java/jibx-extras-$(DEB_VERSION_UPSTREAM).jar \
- usr/share/java/jibx-extras-$(DEB_VERSION_UPSTREAM_2).jar ; \
- dh_link -plibjibx$(DEB_VERSION_UPSTREAM_2)-java usr/share/java/jibx-run-$(DEB_VERSION_UPSTREAM).jar \
- usr/share/java/jibx-run-$(DEB_VERSION_UPSTREAM_2).jar ; \
- dh_link -plibjibx$(DEB_VERSION_UPSTREAM_2)-java usr/share/java/jibx-schema-$(DEB_VERSION_UPSTREAM).jar \
- usr/share/java/jibx-schema-$(DEB_VERSION_UPSTREAM_2).jar ; \
- fi
+ cd build && /usr/lib/jvm/default-java/bin/java -classpath /usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/ant/lib/ant-launcher.jar:/usr/share/java/bcel.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/xpp3.jar:/usr/share/java/joda-time.jar:/usr/lib/jvm/default-java/lib/tools.jar\
+ -Dant.home=/usr/share/ant org.apache.tools.ant.Main -Dbindname=jibx-bind-1.2.6 -Dextrasname=jibx-extras-1.2.6 -Drunname=jibx-run-1.2.6\
+ -Dschemaname=jibx-schema-1.2.6 setrelease current devdoc
-override_dh_link:
- dh_link
- dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_VERSION_UPSTREAM).jar usr/share/java/jibx-bind.jar
- dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_VERSION_UPSTREAM).jar usr/share/java/jibx-extras.jar
- dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_VERSION_UPSTREAM).jar usr/share/java/jibx-run.jar
- dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_VERSION_UPSTREAM).jar usr/share/java/jibx-schema.jar
+execute_after_jh_classpath:
+ for art in bind extras run schema; do\
+ rm debian/libjibx1.2-java/usr/share/java/jibx-$$art.jar;\
+ dh_link -plibjibx-java usr/share/java/jibx-$$art-$(DEB_VERSION_UPSTREAM).jar usr/share/java/jibx-$$art.jar;\
+ done
View it on GitLab: https://salsa.debian.org/java-team/libjibx1.2-java/-/compare/4fa8ed38519c045b454c60f6662c37e08ee6a127...79a003c074e954e021e38f975d7c1ebd5af01ad3
--
View it on GitLab: https://salsa.debian.org/java-team/libjibx1.2-java/-/compare/4fa8ed38519c045b454c60f6662c37e08ee6a127...79a003c074e954e021e38f975d7c1ebd5af01ad3
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/20250126/2d999d04/attachment.htm>
More information about the pkg-java-commits
mailing list