[Pkg-freeipa-devel] [Git][freeipa-team/ldapjdk][master] 12 commits: rules: use git archive and pkg-info.mk for gentarball.
Timo Aaltonen (@tjaalton)
gitlab at salsa.debian.org
Mon Sep 28 13:17:51 BST 2026
Timo Aaltonen pushed to branch master at FreeIPA packaging / ldapjdk
Commits:
082e7fa0 by Jarl Gullberg at 2026-09-27T13:48:46+02:00
rules: use git archive and pkg-info.mk for gentarball.
- - - - -
dcb621a8 by Jarl Gullberg at 2026-09-27T13:50:29+02:00
control: update standards version
- - - - -
b3e38e6c by Jarl Gullberg at 2026-09-27T13:51:03+02:00
control: update libjss minimum version
- - - - -
b0897cce by Jarl Gullberg at 2026-09-27T13:51:18+02:00
control: remove redundant build dependency
- - - - -
938fe6ef by Jarl Gullberg at 2026-09-27T13:51:52+02:00
control: don't use Build-Depends-Indep
- - - - -
1c6c807a by Jarl Gullberg at 2026-09-28T11:47:50+02:00
control: remove explicit build dependency on ant
- - - - -
9b34211a by Jarl Gullberg at 2026-09-28T11:47:55+02:00
rules: explicitly use maven
- - - - -
e2b5798f by Jarl Gullberg at 2026-09-28T11:47:56+02:00
libldap-java.poms: sort pom files
- - - - -
23531062 by Jarl Gullberg at 2026-09-28T11:47:57+02:00
remove redundant files.
- - - - -
af21e788 by Jarl Gullberg at 2026-09-28T11:47:58+02:00
remove libldap-java.classpath
Maven handles dependency metadata on its own, so we don't need to explicitly specify it.
- - - - -
8a39e667 by Jarl Gullberg at 2026-09-28T11:47:59+02:00
patches: patch versions in pom.xml
- - - - -
c59a3591 by Timo Aaltonen at 2026-09-28T15:17:46+03:00
Merge branch 'new-5-7-0' into 'master'
Update packaging for upstream version v5.7.0
See merge request freeipa-team/ldapjdk!2
- - - - -
8 changed files:
- debian/control
- − debian/libldap-java.classpath
- debian/libldap-java.poms
- − debian/maven.cleanIgnoreRules
- − debian/maven.publishedRules
- + debian/patches/patch-pom-versions.diff
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -4,15 +4,12 @@ Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at alioth-lists.debian.net>
Uploaders: Timo Aaltonen <tjaalton at debian.org>
Priority: optional
Build-Depends:
- ant,
debhelper-compat (= 13),
- maven-debian-helper,
-Build-Depends-Indep:
default-jdk,
- libjss-java (>= 5.5.0),
- liboro-java,
+ libjss-java (>= 5.10.0),
libslf4j-java,
-Standards-Version: 4.6.0
+ maven-debian-helper,
+Standards-Version: 4.7.2
Vcs-Git: https://salsa.debian.org/freeipa-team/ldapjdk.git
Vcs-Browser: https://salsa.debian.org/freeipa-team/ldapjdk
Homepage: https://github.com/dogtagpki/ldap-sdk
@@ -20,9 +17,7 @@ Homepage: https://github.com/dogtagpki/ldap-sdk
Package: libldap-java
Architecture: all
Depends:
- libjss-java (>= 5.9.0~),
- libslf4j-java,
-# ${maven:Depends},
+ ${maven:Depends},
${misc:Depends}
Description: Netscape Directory SDK for Java
The Netscape Directory SDK for Java includes the LDAP Java classes,
=====================================
debian/libldap-java.classpath deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/ldapjdk.jar /usr/share/java/jss.jar /usr/share/java/slf4j-api.jar
=====================================
debian/libldap-java.poms
=====================================
@@ -27,8 +27,8 @@
#
pom.xml --has-package-version
java-sdk/pom.xml --has-package-version
-java-sdk/ldapjdk/pom.xml --has-package-version
java-sdk/ldapbeans/pom.xml --has-package-version
-java-sdk/ldapfilter/pom.xml --has-package-version
-java-sdk/ldapsp/pom.xml --has-package-version
java-sdk/ldaptools/pom.xml --has-package-version
+java-sdk/ldapjdk/pom.xml --has-package-version
+java-sdk/ldapsp/pom.xml --has-package-version
+java-sdk/ldapfilter/pom.xml --has-package-version
=====================================
debian/maven.cleanIgnoreRules deleted
=====================================
@@ -1 +0,0 @@
-
=====================================
debian/maven.publishedRules deleted
=====================================
@@ -1 +0,0 @@
-
=====================================
debian/patches/patch-pom-versions.diff
=====================================
@@ -0,0 +1,85 @@
+Description: Patch versions in pom.xml
+ The versions specified in the various pom.xml files do not match the actual
+ release version. This patch fixes that.
+Author: Jarl Gullberg <jarl.gullberg at visar-systems.com>
+Forwarded: https://github.com/dogtagpki/ldap-sdk/pull/63
+Last-Update: 2026-09-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/java-sdk/ldapbeans/pom.xml
++++ b/java-sdk/ldapbeans/pom.xml
+@@ -8,7 +8,7 @@
+ <parent>
+ <groupId>org.dogtagpki.ldap-sdk</groupId>
+ <artifactId>java-sdk-parent</artifactId>
+- <version>5.6.0-SNAPSHOT</version>
++ <version>5.7.0</version>
+ </parent>
+
+ <artifactId>ldapbeans</artifactId>
+--- a/java-sdk/ldapfilter/pom.xml
++++ b/java-sdk/ldapfilter/pom.xml
+@@ -8,7 +8,7 @@
+ <parent>
+ <groupId>org.dogtagpki.ldap-sdk</groupId>
+ <artifactId>java-sdk-parent</artifactId>
+- <version>5.6.0-SNAPSHOT</version>
++ <version>5.7.0</version>
+ </parent>
+
+ <artifactId>ldapfilter</artifactId>
+--- a/java-sdk/ldapjdk/pom.xml
++++ b/java-sdk/ldapjdk/pom.xml
+@@ -8,7 +8,7 @@
+ <parent>
+ <groupId>org.dogtagpki.ldap-sdk</groupId>
+ <artifactId>java-sdk-parent</artifactId>
+- <version>5.6.0-SNAPSHOT</version>
++ <version>5.7.0</version>
+ </parent>
+
+ <artifactId>ldapjdk</artifactId>
+--- a/java-sdk/ldapsp/pom.xml
++++ b/java-sdk/ldapsp/pom.xml
+@@ -8,7 +8,7 @@
+ <parent>
+ <groupId>org.dogtagpki.ldap-sdk</groupId>
+ <artifactId>java-sdk-parent</artifactId>
+- <version>5.6.0-SNAPSHOT</version>
++ <version>5.7.0</version>
+ </parent>
+
+ <artifactId>ldapsp</artifactId>
+--- a/java-sdk/ldaptools/pom.xml
++++ b/java-sdk/ldaptools/pom.xml
+@@ -8,7 +8,7 @@
+ <parent>
+ <groupId>org.dogtagpki.ldap-sdk</groupId>
+ <artifactId>java-sdk-parent</artifactId>
+- <version>5.6.0-SNAPSHOT</version>
++ <version>5.7.0</version>
+ </parent>
+
+ <artifactId>ldaptools</artifactId>
+--- a/java-sdk/pom.xml
++++ b/java-sdk/pom.xml
+@@ -8,7 +8,7 @@
+ <parent>
+ <groupId>org.dogtagpki.ldap-sdk</groupId>
+ <artifactId>ldap-sdk-parent</artifactId>
+- <version>5.6.0-SNAPSHOT</version>
++ <version>5.7.0</version>
+ </parent>
+
+ <artifactId>java-sdk-parent</artifactId>
+--- a/pom.xml
++++ b/pom.xml
+@@ -6,7 +6,7 @@
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.dogtagpki.ldap-sdk</groupId>
+ <artifactId>ldap-sdk-parent</artifactId>
+- <version>5.6.0-SNAPSHOT</version>
++ <version>5.7.0</version>
+ <packaging>pom</packaging>
+
+ <properties>
=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-#placeholder
+patch-pom-versions.diff
=====================================
debian/rules
=====================================
@@ -1,13 +1,11 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
+include /usr/share/dpkg/pkg-info.mk
%:
- dh $@
+ dh $@ --buildsystem=maven
-get-orig-source: SOURCE=ldapjdk
-get-orig-source: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//')
-get-orig-source:
- tar --transform 's,^,$(SOURCE)-$(UV)/,' \
- --exclude 'debian' --exclude-vcs \
- -cJf ../$(SOURCE)_$(UV).orig.tar.xz .
+gentarball:
+ git archive --format=tar upstream --prefix=$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/ ":(exclude)debian" | \
+ xz --best \
+ > ../$(DEB_SOURCE)_$(DEB_VERSION_UPSTREAM).orig.tar.xz
View it on GitLab: https://salsa.debian.org/freeipa-team/ldapjdk/-/compare/38fff0f672d058c7de25580ca30f4e12f731e5e3...c59a3591d614e902c0660fc41d41824a57aaacae
--
View it on GitLab: https://salsa.debian.org/freeipa-team/ldapjdk/-/compare/38fff0f672d058c7de25580ca30f4e12f731e5e3...c59a3591d614e902c0660fc41d41824a57aaacae
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-freeipa-devel/attachments/20260928/a228a55a/attachment-0001.htm>
More information about the Pkg-freeipa-devel
mailing list