[Git][java-team/geronimo-osgi-support][master] 10 commits: Wrap and sort
Emmanuel Bourg
gitlab at salsa.debian.org
Thu Jan 28 14:59:51 GMT 2021
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / geronimo-osgi-support
Commits:
abac3fe1 by Emmanuel Bourg at 2021-01-28T15:03:46+01:00
Wrap and sort
- - - - -
2a0b75e9 by Emmanuel Bourg at 2021-01-28T15:04:27+01:00
Standards-Version updated to 4.5.1
- - - - -
464e5287 by Emmanuel Bourg at 2021-01-28T15:04:44+01:00
Switch to debhelper level 13
- - - - -
58539297 by Emmanuel Bourg at 2021-01-28T15:04:50+01:00
Use salsa.debian.org Vcs-* URLs
- - - - -
501a4086 by Emmanuel Bourg at 2021-01-28T15:13:24+01:00
Removed the -java-doc package
- - - - -
b7bfb4b6 by Emmanuel Bourg at 2021-01-28T15:13:28+01:00
Removed debian/orig-tar.sh
- - - - -
aeeceb86 by Emmanuel Bourg at 2021-01-28T15:13:28+01:00
Fixed the description of the package
- - - - -
b5eeaf52 by Emmanuel Bourg at 2021-01-28T15:58:32+01:00
Build with Maven instead of jh_build
- - - - -
aa3790c9 by Emmanuel Bourg at 2021-01-28T15:59:23+01:00
Use secure URLs
- - - - -
0daa90a5 by Emmanuel Bourg at 2021-01-28T15:59:33+01:00
Upload to unstable
- - - - -
14 changed files:
- − debian/build.xml
- debian/changelog
- − debian/classpath-debian
- − debian/clean
- − debian/compat
- debian/control
- debian/copyright
- − debian/libgeronimo-osgi-support-java-doc.javadoc
- debian/libgeronimo-osgi-support-java.poms
- − debian/orig-tar.sh
- + debian/patches/01-bundle-extension.patch
- + debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/build.xml deleted
=====================================
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="geronimo-osgi-support" default="javadoc">
- <property name="dir.src" location="${basedir}/src" />
- <property name="dir.src.registry" location="${basedir}/../geronimo-osgi-registry" />
- <property name="dir.src.locator" location="${basedir}/../geronimo-osgi-locator" />
- <property name="dir.build.api" location="${basedir}/_jh_build.javadoc/api/" />
-
- <path id="classpath">
- <fileset dir="/" includesfile="classpath-debian"/>
- <fileset dir="${basedir}/.." includes="geronimo-osgi-locator.jar"/>
- <pathelement path="/usr/share/java/osgi.core.jar"/>
- <pathelement path="/usr/share/java/osgi.compendium.jar"/>
- </path>
-
- <target name="javadoc">
- <mkdir dir="${dir.build.api}"/>
- <javadoc destdir="${dir.build.api}" classpathref="classpath">
- <fileset dir="${dir.src.registry}" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- <fileset dir="${dir.src.locator}" defaultexcludes="yes">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
-
-</project>
=====================================
debian/changelog
=====================================
@@ -1,14 +1,25 @@
-geronimo-osgi-support (1.1-2) UNRELEASED; urgency=medium
+geronimo-osgi-support (1.1-2) unstable; urgency=medium
* Team upload.
+
+ [ Miguel Landaeta ]
* Remove myself from uploaders list. (Closes: #871854)
- * Bump DH compat level to 10.
* Update Vcs-Git field to use HTTPS in URL.
* Bump Standards-Version to 3.9.8. No changes were required.
* Update copyright info.
* Wrap and sort dependency lists.
- -- Miguel Landaeta <nomadium at debian.org> Sun, 06 Aug 2017 20:07:30 +0100
+ [ Emmanuel Bourg ]
+ * Build with Maven instead of jh_build
+ * Removed the -java-doc package
+ * Standards-Version updated to 4.5.1
+ * Switch to debhelper level 13
+ * Use salsa.debian.org Vcs-* URLs
+ * Removed debian/orig-tar.sh
+ * Fixed the description of the package
+ * Use secure URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 28 Jan 2021 15:59:28 +0100
geronimo-osgi-support (1.1-1) unstable; urgency=medium
=====================================
debian/classpath-debian deleted
=====================================
@@ -1 +0,0 @@
-usr/share/java/org.eclipse.osgi.services.jar
=====================================
debian/clean deleted
=====================================
@@ -1,2 +0,0 @@
-geronimo-osgi-registry.jar
-geronimo-osgi-locator.jar
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -2,57 +2,34 @@ Source: geronimo-osgi-support
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Build-Depends: ant,
- debhelper (>= 10~),
- default-jdk,
- javahelper,
- libosgi-compendium-java,
- libosgi-core-java,
- maven-repo-helper
-Standards-Version: 3.9.8
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/geronimo-osgi-support.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/geronimo-osgi-support.git
-Homepage: http://geronimo.apache.org
+Build-Depends:
+ debhelper-compat (= 13),
+ default-jdk,
+ libmaven-bundle-plugin-java,
+ libosgi-compendium-java,
+ libosgi-core-java,
+ maven-debian-helper
+Standards-Version: 4.5.1
+Vcs-Git: https://salsa.debian.org/java-team/geronimo-osgi-support.git
+Vcs-Browser: https://salsa.debian.org/java-team/geronimo-osgi-support
+Homepage: https://geronimo.apache.org
Package: libgeronimo-osgi-support-java
Architecture: all
-Depends: libosgi-compendium-java,
- libosgi-core-java,
- ${misc:Depends}
-Suggests: libgeronimo-osgi-support-java-doc (= ${binary:Version})
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}
Description: Java libraries providing OSGi lookup support for Geronimo projects
These Java libraries allow the use of OSGi framework with Geronimo existing
projects. They allow lookup and registration of components.
.
- geronimo-osgi-locator.jar: Allow performing class and components lookups
with OSGi support.
- .
- - geronimo-osgi-registry.jar: Facilitate the use of Geronimo specs providers
- (components typically plugged in to the JRE through META-INF/services
- resources) like geronimo-validation-1.0-spec (Geronimo JSR-303 Bean
- Validation Spec API).
- .
- The service created by this library will maintain a registry of factory
- class that can be used by the spec bundles to locate factory classes that
- reside in other bundles.
-
-Package: libgeronimo-osgi-support-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Suggests: libgeronimo-osgi-support-java (= ${binary:Version})
-Description: Documentation for libgeronimo-osgi-support-java
- Documentation for Java libraries that allow the use of OSGi framework with
- Geronimo existing projects. They allow lookup and registration of components.
.
- - geronimo-osgi-locator.jar: Allow performing class and components lookups
- with OSGi support.
- .
- geronimo-osgi-registry.jar: Facilitate the use of Geronimo specs providers
(components typically plugged in to the JRE through META-INF/services
resources) like geronimo-validation-1.0-spec (Geronimo JSR-303 Bean
Validation Spec API).
- .
+ .
The service created by this library will maintain a registry of factory
class that can be used by the spec bundles to locate factory classes that
reside in other bundles.
=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Geronimo OSGi Support
-Source: http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-osgi-support-1.0/
+Source: https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-osgi-support-1.0/
Files: *
Copyright: 2010, The Apache Software Foundation
=====================================
debian/libgeronimo-osgi-support-java-doc.javadoc deleted
=====================================
@@ -1 +0,0 @@
-internal /usr/share/doc/libgeronimo-osgi-support-java/api
=====================================
debian/libgeronimo-osgi-support-java.poms
=====================================
@@ -26,8 +26,8 @@
# Empty by default. [mh_install]
#
pom.xml --no-parent --has-package-version
-geronimo-osgi-registry/pom.xml --has-package-version --java-lib --artifact=geronimo-osgi-registry.jar
-geronimo-osgi-locator/pom.xml --has-package-version --java-lib --artifact=geronimo-osgi-locator.jar
+geronimo-osgi-registry/pom.xml --has-package-version --java-lib
+geronimo-osgi-locator/pom.xml --has-package-version --java-lib
geronimo-osgi-itesta/pom.xml --ignore
geronimo-osgi-itestb/pom.xml --ignore
geronimo-osgi-registry-itests/pom.xml --ignore
=====================================
debian/orig-tar.sh deleted
=====================================
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# called by uscan with '--upstream-version' <version> <file>
-echo "version $2"
-package=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
-version=$2
-tarball=$3
-TAR=../${package}_${version}.orig.tar.xz
-DIR=${package}-${version}.orig
-REPO="http://svn.apache.org/repos/asf/geronimo/specs/tags/${package}-${version}/"
-
-# setting timezone to avoid varying times
-TZ=Etc/UTC svn export $REPO $DIR
-XZ_OPT=--best tar --numeric --group 0 --owner 0 -c -v -J -f $TAR $DIR
-
-rm -rf $tarball $DIR
=====================================
debian/patches/01-bundle-extension.patch
=====================================
@@ -0,0 +1,33 @@
+Description: Declare maven-bundle-plugin as an extension to build the bundles
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/geronimo-osgi-registry/pom.xml
++++ b/geronimo-osgi-registry/pom.xml
+@@ -65,6 +65,8 @@
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
++ <version>debian</version>
++ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.geronimo.osgi.registry.api;version=1.0</Export-Package>
+--- a/geronimo-osgi-locator/pom.xml
++++ b/geronimo-osgi-locator/pom.xml
+@@ -46,6 +46,7 @@
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-osgi-registry</artifactId>
+ <version>${version}</version>
++ <type>bundle</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+@@ -67,6 +68,8 @@
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
++ <version>debian</version>
++ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>*</Import-Package>
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+01-bundle-extension.patch
=====================================
debian/rules
=====================================
@@ -1,22 +1,4 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar
-
%:
- dh $@ --with javahelper,maven-repo-helper
-
-override_jh_build:
- jh_build -N geronimo-osgi-registry.jar geronimo-osgi-registry/src/main
- CLASSPATH=$${CLASSPATH}:./geronimo-osgi-registry.jar jh_build -N \
- geronimo-osgi-locator.jar geronimo-osgi-locator/src/main
- ant -f debian/build.xml javadoc
-
-get-orig-source:
- cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
- uscan \
- --verbose \
- --no-symlink \
- --destdir $(CURDIR) \
- --watchfile debian/watch \
- --force-download
+ dh $@
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
-http://svn.apache.org/repos/asf/geronimo/specs/tags/ \
-geronimo-osgi-support-(.*)/ debian debian/orig-tar.sh
+version=4
+opts="mode=svn,repack,compression=xz" \
+https://svn.apache.org/repos/asf/geronimo/specs/tags/ geronimo-osgi-support-(.*)/
View it on GitLab: https://salsa.debian.org/java-team/geronimo-osgi-support/-/compare/510c6fd8cfe44d74c907fc2182de86c0c65d6b19...0daa90a5de49bec69729d0de5d4e56ab44b88242
--
View it on GitLab: https://salsa.debian.org/java-team/geronimo-osgi-support/-/compare/510c6fd8cfe44d74c907fc2182de86c0c65d6b19...0daa90a5de49bec69729d0de5d4e56ab44b88242
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/20210128/562d98b1/attachment.html>
More information about the pkg-java-commits
mailing list