Emmanuel Bourg pushed to branch master at Debian Java Maintainers /
eclipse-debian-helper
Commits:
ffb2589d by Emmanuel Bourg at 2024-07-21T22:25:14+02:00
Document the basedir parameter
- - - - -
e9d7d6a1 by Emmanuel Bourg at 2024-07-21T22:27:03+02:00
Support bundle dependencies from different base directories
- - - - -
dbdf0d8a by Emmanuel Bourg at 2024-07-21T22:27:11+02:00
Standards-Version updated to 4.7.0
- - - - -
8fb1aa1b by Emmanuel Bourg at 2024-07-21T22:27:56+02:00
Upload to unstable
- - - - -
4 changed files:
- README.md
- debian/changelog
- debian/control
- src/ant/build-eclipse-bundle.xml
Changes:
=====================================
README.md
=====================================
@@ -11,7 +11,7 @@ a debhelper buildsystem class to reduce the boiler plate in
debian/rules.
By convention we assume a one to one mapping between bundles and Debian
packages. The package name is automatically derived from the bundle name.
-For example the `org.eclipse.foo.bar`bundle is packaged as
+For example the `org.eclipse.foo.bar` bundle is packaged as
`libeclipse-foo-bar-java`. Equinox packages are handled slightly differently,
`org.eclipse.equinox.foo` is mapped to `libequinox-foo-java`.
@@ -81,6 +81,10 @@ Usage
elements inside `<make-bundle>`, for example with `<fileset>`
or `<pathelement>`.
+5. A default source layout is assumed with a `bundles` directory containing
+ one directory per bundle. If the project uses a different layout, the
+ `<make-bundle>` macro accepts a `basedir` parameter to change the location
+ of the base directory.
Limitations
-----------
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+eclipse-debian-helper (1.10) unstable; urgency=medium
+
+ * Support bundle dependencies from different base directories
+ * Standards-Version updated to 4.7.0
+
+ -- Emmanuel Bourg <[email protected]> Sun, 21 Jul 2024 22:27:36 +0200
+
eclipse-debian-helper (1.9) unstable; urgency=medium
* Support multiple bundles directories
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Emmanuel Bourg <[email protected]>
Build-Depends: debhelper-compat (= 13),
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/java-team/eclipse-debian-helper.git
Vcs-Browser: https://salsa.debian.org/java-team/eclipse-debian-helper
Homepage: https://salsa.debian.org/java-team/eclipse-debian-helper
=====================================
src/ant/build-eclipse-bundle.xml
=====================================
@@ -35,12 +35,12 @@
<for list="@{depends}" param="dependency">
<sequential>
<if>
- <equals arg1="@{basedir}" arg2="." />
+ <equals arg1="${bundle.dir.@{dependency}}"
arg2="./@{dependency}" />
<then>
<concat destfile="${bundle.dir.@{name}}/target/dependencies"
append="true">@{dependency}/target/@{dependency}.jar${line.separator}</concat>
</then>
<else>
- <concat destfile="${bundle.dir.@{name}}/target/dependencies"
append="true">@{basedir}/@{dependency}/target/@{dependency}.jar${line.separator}</concat>
+ <concat destfile="${bundle.dir.@{name}}/target/dependencies"
append="true">${bundle.dir.@{dependency}}/target/@{dependency}.jar${line.separator}</concat>
</else>
</if>
</sequential>
View it on GitLab:
https://salsa.debian.org/java-team/eclipse-debian-helper/-/compare/450c82a0032dc8c0490a3f5b92ed80d4df21b3fa...8fb1aa1b974a4e3133adad1b5cf5077c3603adf4
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://salsa.debian.org/java-team/eclipse-debian-helper/-/compare/450c82a0032dc8c0490a3f5b92ed80d4df21b3fa...8fb1aa1b974a4e3133adad1b5cf5077c3603adf4
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
pkg-java-commits mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
