[Git][java-team/libjibx1.2-java][master] 5 commits: debhelper-compat = 13 (+fixing typo)
Andreas Tille (@tille)
gitlab at salsa.debian.org
Fri Jan 24 15:15:47 GMT 2025
Andreas Tille pushed to branch master at Debian Java Maintainers / libjibx1.2-java
Commits:
fc31f9ef by Andreas Tille at 2025-01-23T20:48:53+01:00
debhelper-compat = 13 (+fixing typo)
- - - - -
47efc601 by Andreas Tille at 2025-01-24T14:38:29+01:00
Standards-Version: 4.7.0 (routine-update)
- - - - -
b41db269 by Andreas Tille at 2025-01-24T14:40:26+01:00
Drop useless get-orig-source target (routine-update)
- - - - -
274d7bb5 by Andreas Tille at 2025-01-24T15:47:40+01:00
Trim trailing whitespace.
Changes-By: lintian-brush
Fixes: lintian: trailing-whitespace
See-also: https://lintian.debian.org/tags/trailing-whitespace.html
- - - - -
4fa8ed38 by Andreas Tille at 2025-01-24T16:14:21+01:00
Attempt to switch from cdbs to dh but failed blatantly
- - - - -
4 changed files:
- debian/changelog
- − debian/compat
- debian/control
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -5,6 +5,10 @@ libjibx1.2-java (1.2.6-3) UNRELEASED; urgency=medium
* Fix Vcs fields
* d/watch: Ensure only 1.2.? version will be reported
* d/copyright: Use Files-Excluded to exclude files from upstream source
+ * debhelper-compat = 13
+ * Standards-Version: 4.7.0 (routine-update)
+ * Drop useless get-orig-source target (routine-update)
+ * Trim trailing whitespace.
-- Andreas Tille <tille at debian.org> Thu, 23 Jan 2025 19:56:18 +0100
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-9
=====================================
debian/control
=====================================
@@ -1,27 +1,28 @@
Source: libjibx1.2-java
-Section: java
-Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>,
Stephen Nelson <stephen at eccostudio.com>
-Build-Depends: ant, cdbs (>= 0.4.8), debhelper (>= 9), default-jdk, maven-repo-helper
+Section: java
+Priority: optional
+Build-Depends: ant,
+ debhelper-compat (= 13),
+ default-jdk,
+ maven-repo-helper
Build-Depends-Indep: libbcel-java,
libjoda-time-java,
liblog4j1.2-java,
libxpp3-java
-Standards-Version: 4.1.4
+Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/java-team/libjibx1.2-java
Vcs-Git: https://salsa.debian.org/java-team/libjibx1.2-java.git
-
-Vcs-Git: git://anonscm.debian.org/pkg-java/libjibx-java.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libjibx-java.git
Homepage: https://jibx.sourceforge.io/
Package: libjibx1.2-java
Architecture: all
-Depends: libbcel-java, libxpp3-java, ${misc:Depends}
+Depends: libbcel-java,
+ libxpp3-java,
+ ${misc:Depends}
Suggests: libjibx-java-doc
-Conflicts: libjibx-java (<= 1.0.2-1)
Description: Framework for binding XML data to Java objects
JiBX lets you work with data from XML documents using your own class
structures. The JiBX framework handles all the details of converting
@@ -32,7 +33,8 @@ Description: Framework for binding XML data to Java objects
Package: libjibx-java
Architecture: all
-Depends: libjibx1.2-java, ${misc:Depends}
+Depends: libjibx1.2-java,
+ ${misc:Depends}
Description: Framework for binding XML data to Java objects (symlink)
JiBX lets you work with data from XML documents using your own class
structures. The JiBX framework handles all the details of converting
@@ -45,8 +47,8 @@ Description: Framework for binding XML data to Java objects (symlink)
versioned jar.
Package: libjibx1.2-java-doc
-Section: doc
Architecture: all
+Section: doc
Depends: ${misc:Depends}
Suggests: libjibx-java
Description: Framework for binding XML data to Java objects (documentation)
=====================================
debian/rules
=====================================
@@ -1,43 +1,45 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/dpkg/default.mk
-DEB_COMPRESS_EXCLUDE_DEFAULT := .class
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_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION)
+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_INSTALL_CHANGELOGS_ALL := changes.txt
-DEB_UPSTREAM_VERSION_2 := $(shell echo $(DEB_UPSTREAM_VERSION) | cut -f1,2 -d. )
+DEB_VERSION_UPSTREAM_2 := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -f1,2 -d. )
-clean::
- mh_clean
+%:
+ dh $@ --with javahelper
+
+override_dh_clean:
+ dh_clean
-rm -fr build/api build/classes lib/*
-install/libjibx1.2-java::
- mh_installpoms -plibjibx$(DEB_UPSTREAM_VERSION_2)-java
- mh_installjar -plibjibx$(DEB_UPSTREAM_VERSION_2)-java --usj-version=$(DEB_UPSTREAM_VERSION) --java-lib --no-usj-versionless debian/jibx-run.pom lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar
- mh_installjar -plibjibx$(DEB_UPSTREAM_VERSION_2)-java --usj-version=$(DEB_UPSTREAM_VERSION) --java-lib --no-usj-versionless debian/jibx-bind.pom lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar
- mh_installjar -plibjibx$(DEB_UPSTREAM_VERSION_2)-java --usj-version=$(DEB_UPSTREAM_VERSION) --java-lib --no-usj-versionless debian/jibx-extras.pom lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar
- mh_installjar -plibjibx$(DEB_UPSTREAM_VERSION_2)-java --usj-version=$(DEB_UPSTREAM_VERSION) --java-lib --no-usj-versionless debian/jibx-schema.pom lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar
- if [ "$(DEB_UPSTREAM_VERSION)" != "$(DEB_UPSTREAM_VERSION_2)" ]; then \
- dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION_2).jar ; \
- dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION_2).jar ; \
- dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION_2).jar ; \
- dh_link -plibjibx$(DEB_UPSTREAM_VERSION_2)-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar \
- usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION_2).jar ; \
- fi
+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
-install/libjibx-java::
- dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind.jar
- dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar
- dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run.jar
- dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema.jar
+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
-get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
+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
View it on GitLab: https://salsa.debian.org/java-team/libjibx1.2-java/-/compare/2de53462592e863c86547eb61e7e1a3fe9ef4175...4fa8ed38519c045b454c60f6662c37e08ee6a127
--
View it on GitLab: https://salsa.debian.org/java-team/libjibx1.2-java/-/compare/2de53462592e863c86547eb61e7e1a3fe9ef4175...4fa8ed38519c045b454c60f6662c37e08ee6a127
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/20250124/a0539ece/attachment.htm>
More information about the pkg-java-commits
mailing list