[Git][java-team/felix-osgi-obr][master] 6 commits: Standards-Version updated to 4.2.1
Emmanuel Bourg
gitlab at salsa.debian.org
Tue Oct 30 14:29:51 GMT 2018
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / felix-osgi-obr
Commits:
59203e97 by Emmanuel Bourg at 2018-10-30T13:10:32Z
Standards-Version updated to 4.2.1
- - - - -
aa9f262f by Emmanuel Bourg at 2018-10-30T13:11:42Z
Wrap and sort
- - - - -
4501dd52 by Emmanuel Bourg at 2018-10-30T14:22:54Z
Build with Maven instead of Ant
- - - - -
9f5e1e6d by Emmanuel Bourg at 2018-10-30T14:23:03Z
Use salsa.debian.org Vcs-* URLs
- - - - -
926b759d by Emmanuel Bourg at 2018-10-30T14:25:23Z
Use a secure URI in debian/watch
- - - - -
f1915336 by Emmanuel Bourg at 2018-10-30T14:25:42Z
Upload to unstable
- - - - -
12 changed files:
- − debian/MANIFEST.MF
- − debian/build.xml
- debian/changelog
- debian/control
- − debian/libfelix-osgi-obr-java-doc.docs
- + debian/libfelix-osgi-obr-java-doc.install
- − debian/libfelix-osgi-obr-java.install
- − debian/libfelix-osgi-obr-java.links
- debian/libfelix-osgi-obr-java.poms
- debian/maven.rules
- debian/rules
- debian/watch
Changes:
=====================================
debian/MANIFEST.MF deleted
=====================================
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Built-By: pauls
-Created-By: Apache Maven Bundle Plugin
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.osgi.framework;version="1.3",org.osgi.service.obr;
- version="1.0"
-Bnd-LastModified: 1208866656616
-Export-Package: org.osgi.service.obr;uses:="org.osgi.framework";versio
- n="1.0"
-Bundle-Version: 1
-Bundle-Copyright: Copyright (c) OSGi Alliance (2000, 2008). All Rights
- Reserved.
-Bundle-Name: OSGi OBR Service API
-Bundle-Description: OSGi OBR Service API
-Build-Jdk: 1.5.0_13
-Bundle-DocURL: http://www.osgi.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: OSGi Alliance
-Bundle-SymbolicName: org.osgi.service.obr
-Tool: Bnd-0.0.238
-Bundle-Category: osgi
-
=====================================
debian/build.xml deleted
=====================================
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="../" default="build" name="org.osgi.service.obr">
- <description>
- Build script for org.osgi.service.obr library.
- </description>
-
-<!-- config ============================================================== -->
- <!-- general project attributes -->
- <property name="build.app.name" value="${jar.name}-${version}"/>
-
- <!-- directory locations -->
- <property name="build.dst" value="${basedir}/build"/>
- <property name="build.src" value="${basedir}/src/main/java"/>
- <property name="build.dist" value="${basedir}/dist"/>
-
- <property name="build.dst.classes" value="${build.dst}/classes"/>
- <property name="build.dst.doc" value="${build.dst}/doc"/>
-
- <!-- compiler options -->
- <property name="build.compile.debug" value="true"/>
- <property name="build.compile.deprecation" value="false"/>
- <property name="build.compile.optimize" value="true"/>
- <property name="build.compile.version" value="1.5"/>
- <property name="build.compile.lint" value="-Xlint:unchecked"/>
-
- <path id="build.classpath">
- <pathelement location="${build.dst.classes}"/>
- <pathelement path="${build.jar.path}"/>
- </path>
-
-<!-- clean =============================================================== -->
-<target name="clean" description="Delete old build directory">
- <delete dir="${build.dst}"/>
- <delete dir="${build.dist}"/>
-</target>
-
-<!-- prepare ============================================================= -->
-<target name="prepare" description="Prepare build">
- <mkdir dir="${build.dst}"/>
- <mkdir dir="${build.dist}"/>
- <mkdir dir="${build.dst.doc}"/>
-</target>
-
-<!-- compile ============================================================= -->
-<target name="compile" depends="prepare" description="Compile Java sources">
- <mkdir dir="${build.dst.classes}"/>
-
- <javac
- classpathref="build.classpath"
- debug="${build.compile.debug}"
- deprecation="${build.compile.deprecation}"
- optimize="${build.compile.optimize}"
- source="${build.compile.version}"
- destdir="${build.dst.classes}">
- <src path="${build.src}"/>
- <compilerarg value="${build.compile.lint}"/>
- </javac>
-
- <!-- copy resources -->
- <copy todir="${build.dst.classes}">
- <fileset dir="${build.src}" excludes="**/*.java **/*.html **/*.xml **/*.ini"/>
- </copy>
-</target>
-
-<!-- javadoc ============================================================= -->
-<target name="javadoc" depends="compile" description="Create Javadoc">
- <javadoc
- source="${build.compile.version}"
- linksource="yes"
- access="protected"
- locale="en_US"
- encoding="ISO-8859-1"
- docencoding="ISO-8859-1"
- noqualifier="java.*:javax.*"
- destdir="${build.dst.doc}/api"
- windowtitle="[OSGi OBR Service API] API documentation">
- <fileset dir="${build.src}">
- <include name="**/*.java"/>
- </fileset>
- <doctitle>[OSGi OBR Service API] API documentation</doctitle>
- <header><b>[OSGi OBR Service API]</b></header>
- <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
- <classpath refid="build.classpath"/>
- </javadoc>
-</target>
-
-<!-- build =============================================================== -->
-<target name="build" depends="compile" description="Build jar distribution files">
- <jar destfile="${build.dist}/${build.app.name}.jar" manifest="${basedir}/debian/MANIFEST.MF">
- <fileset dir="${build.dst.classes}" excludes="**/*Test* **/*Sample* **/*Run* **/META-INF/**" />
- </jar>
-</target>
-</project>
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+felix-osgi-obr (1.0.2-5) unstable; urgency=medium
+
+ * Team upload.
+ * Build with Maven instead of Ant
+ * Standards-Version updated to 4.2.1
+ * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg at apache.org> Tue, 30 Oct 2018 15:25:38 +0100
+
felix-osgi-obr (1.0.2-4) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -2,28 +2,24 @@ Source: felix-osgi-obr
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders:
- Damien Raude-Morvan <drazzib at debian.org>
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>
Build-Depends:
- ant,
debhelper (>= 11),
default-jdk,
javahelper,
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
libosgi-core-java,
- maven-repo-helper (>= 1.1)
-Standards-Version: 4.1.2
+ maven-debian-helper (>= 2.0)
+Standards-Version: 4.2.1
+Vcs-Git: https://salsa.debian.org/java-team/felix-osgi-obr.git
+Vcs-Browser: https://salsa.debian.org/java-team/felix-osgi-obr
Homepage: http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/felix-osgi-obr.git
-Vcs-Browser: https://anonscm.debian.org/git/pkg-java/felix-osgi-obr.git
Package: libfelix-osgi-obr-java
Architecture: all
-Depends:
- libosgi-core-java,
- ${java:Depends},
- ${misc:Depends}
-Suggests:
- libfelix-osgi-obr-java-doc
+Depends:${misc:Depends}, ${maven:Depends}
+Suggests: libfelix-osgi-obr-java-doc
Description: OSGi OBR Service API
The goal of the Apache Felix OSGi Bundle Repository (OBR) is two-fold:
1. To simplify deploying and using available bundles with Felix.
@@ -33,10 +29,8 @@ Description: OSGi OBR Service API
Package: libfelix-osgi-obr-java-doc
Architecture: all
Section: doc
-Depends:
- ${misc:Depends}
-Recommends:
- ${java:Recommends}
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc
Description: Javadoc API for OSGi OBR Service API
The goal of the Apache Felix OSGi Bundle Repository (OBR) is two-fold:
1. To simplify deploying and using available bundles with Felix.
=====================================
debian/libfelix-osgi-obr-java-doc.docs deleted
=====================================
@@ -1 +0,0 @@
-build/doc/*
=====================================
debian/libfelix-osgi-obr-java-doc.install
=====================================
@@ -0,0 +1 @@
+target/apidocs/* /usr/share/doc/libfelix-osgi-obr-java/api/
=====================================
debian/libfelix-osgi-obr-java.install deleted
=====================================
@@ -1 +0,0 @@
-dist/* usr/share/java
=====================================
debian/libfelix-osgi-obr-java.links deleted
=====================================
@@ -1 +0,0 @@
-/usr/share/java/org.osgi.service.obr-1.0.2.jar /usr/share/java/org.osgi.service.obr.jar
=====================================
debian/libfelix-osgi-obr-java.poms
=====================================
@@ -1 +1 @@
-pom.xml --no-parent
+pom.xml --no-parent --java-lib
=====================================
debian/maven.rules
=====================================
@@ -1 +1,2 @@
s/org.apache.felix/org.osgi/ org.osgi.core * s/.*/debian/
+org.apache.felix maven-bundle-plugin maven-plugin s/1.4.0/3.5.1/ * *
=====================================
debian/rules
=====================================
@@ -1,40 +1,4 @@
#!/usr/bin/make -f
-VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//')
-JAVA_HOME := /usr/lib/jvm/default-java
-CLASSPATH := /usr/share/java/osgi.core.jar
-JAR_NAME := org.osgi.service.obr
-ANT_BUILDFILE := ./debian/build.xml
-ANT_BUILD_TARGET := build javadoc
-ANT_ARGS := -Dbuild.sysclasspath=first \
- -Dversion=$(VERSION) \
- -Djar.name=$(JAR_NAME) \
- -Dbuild.jar.path=$(CLASSPATH)
-
%:
- dh $@ --with javahelper
-
-override_dh_auto_build:
- ant \
- $(ANT_ARGS) \
- -f $(ANT_BUILDFILE) $(ANT_BUILD_TARGET)
-
-override_dh_install:
- mh_installpoms -plibfelix-osgi-obr-java
- mh_installjar -plibfelix-osgi-obr-java -l pom.xml dist/$(JAR_NAME)-$(VERSION).jar
- dh_install
-
-override_dh_clean:
- ant \
- $(ANT_ARGS) \
- -f $(ANT_BUILDFILE) clean
- mh_clean
- dh_clean
-
-get-orig-source:
- uscan \
- --verbose \
- --no-symlink \
- --upstream-version $(VERSION) \
- --download-version $(VERSION) \
- --force-download
+ dh $@
=====================================
debian/watch
=====================================
@@ -1,2 +1,2 @@
version=3
-http://www.apache.org/dist/felix/ org.osgi.service.obr-(.+)-project\.tar\.gz debian debian/orig-tar.sh
+https://www.apache.org/dist/felix/ org.osgi.service.obr-(.+)-project\.tar\.gz debian debian/orig-tar.sh
View it on GitLab: https://salsa.debian.org/java-team/felix-osgi-obr/compare/2c9993a80afe48c280effbd92ac4e73de9dfbc54...f1915336c8a842210b2c2839a3e496a95bdb3ec7
--
View it on GitLab: https://salsa.debian.org/java-team/felix-osgi-obr/compare/2c9993a80afe48c280effbd92ac4e73de9dfbc54...f1915336c8a842210b2c2839a3e496a95bdb3ec7
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/20181030/231c3e5e/attachment.html>
More information about the pkg-java-commits
mailing list