[SCM] felix-main packaging branch, master, updated. debian/2.0.5-1-10-gcd975fd
Damien Raude-Morvan
drazzib at alioth.debian.org
Sat May 14 22:48:46 UTC 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "felix-main packaging".
The branch, master has been updated
via cd975fd5b03ff79f48a667d2de48af962a73795b (commit)
via 5fd4172c1dd3fdb7b9d6a3cc45edd3fe6e182c00 (commit)
via 35e66c144efd48550bc71635d0c3a7ed679e3f46 (commit)
from 8a03dc49223ba7fc3ca36b4136923e2485cf1b6d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit cd975fd5b03ff79f48a667d2de48af962a73795b
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sun May 15 00:14:54 2011 +0200
Fix last errors in Build-Depends.
commit 5fd4172c1dd3fdb7b9d6a3cc45edd3fe6e182c00
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sat May 14 19:23:12 2011 +0200
Prepare for release to unstable
commit 35e66c144efd48550bc71635d0c3a7ed679e3f46
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed May 11 00:39:38 2011 +0200
Use Maven build-system, as upstream.
-----------------------------------------------------------------------
Summary of changes:
debian/MANIFEST.MF | 35 --
debian/README.source | 18 +
debian/build.xml | 97 ------
debian/changelog | 17 +-
debian/control | 16 +-
debian/default.properties | 461 ---------------------------
debian/libfelix-main-java-doc.doc-base | 4 +-
debian/libfelix-main-java-doc.docs | 3 +-
debian/libfelix-main-java-doc.install | 1 +
debian/libfelix-main-java.install | 1 -
debian/libfelix-main-java.links | 2 -
debian/maven.ignoreRules | 20 ++
debian/maven.properties | 3 +
debian/maven.rules | 21 ++
debian/patches/bootstrap_packaging_jar.diff | 18 +
debian/patches/default_version.diff | 17 +
debian/patches/pom.patch | 82 -----
debian/patches/series | 4 +-
debian/rules | 32 +--
19 files changed, 129 insertions(+), 723 deletions(-)
diff --git a/debian/MANIFEST.MF b/debian/MANIFEST.MF
deleted file mode 100644
index 9746c4e..0000000
--- a/debian/MANIFEST.MF
+++ /dev/null
@@ -1,35 +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
-Bnd-LastModified: 1271030219548
-Export-Package: org.osgi.service.packageadmin;uses:="org.osgi.framewor
- k";version="1.2",org.osgi.framework.hooks.service;uses:="org.osgi.fra
- mework";version="1.0",org.osgi.service.url;version="1.0",org.osgi.ser
- vice.startlevel;uses:="org.osgi.framework";version="1.1",org.osgi.fra
- mework;version="1.5",org.osgi.framework.launch;uses:="org.osgi.framew
- ork";version="1.0",org.osgi.util.tracker;uses:="org.osgi.framework";v
- ersion="1.4"
-Bundle-Version: 2.0.5
-Ignore-Package: java.lang,org.osgi.framework.hooks.service,java.net,an
- droid.dalvik,org.osgi.service.startlevel,java.security,javax.security
- .auth.x500,org.osgi.framework,dalvik.system,java.lang.reflect,org.osg
- i.service.packageadmin,org.osgi.service.url,java.util,java.lang.ref,j
- ava.io,java.security.cert,org.osgi.framework.launch,java.util.zip,org
- .osgi.util.tracker,java.util.jar
-Bundle-Name: Apache Felix
-Bundle-Description: OSGi R4 framework.
-Build-Jdk: 1.5.0_22
-Private-Package: org.apache.felix.framework,org.apache.felix.framework
- .cache,org.apache.felix.framework.ext,org.apache.felix.framework.sear
- chpolicy,org.apache.felix.framework.util,org.apache.felix.framework.u
- til.manifestparser,org.apache.felix.main,org.apache.felix.moduleloade
- r
-Bundle-DocURL: http://www.apache.org/
-Bundle-ManifestVersion: 2
-Bundle-Vendor: The Apache Software Foundation
-Main-Class: org.apache.felix.main.Main
-Bundle-SymbolicName: org.apache.felix.main
-Tool: Bnd-0.0.255
-Embed-Dependency: *;artifactId=org.apache.felix.framework;inline=true
-
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..79de08d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+Information about felix-main
+------------------------------
+
+The build system uses Maven but prevents it from downloading
+anything from the Internet, making the build compliant with
+the Debian policy.
+
+
+Bootstrapping felix-main
+------------------------------------
+Since libfelix-main-java Build-Depends on libmaven-bundle-plugin-java
+and libmaven-bundle-plugin-java also Build-Depends on libfelix-main-java
+we need a way to bootstrap this.
+
+To build felix-main without bundle metadata :
+1) d/control: Drop Build-Depends on libmaven-bundle-plugin-java
+2) d/patches/series: Decomment bootstrap_packaging_jar.diff patch
+3) d/maven.ignoreRules: Decomment maven-bundle-plugin dependency
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 7714517..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project basedir="../" default="build" name="org.osgi.service.obr">
- <description>
- Build script for felixframework 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="[Felix Framework] API documentation">
- <fileset dir="${build.src}">
- <include name="**/*.java"/>
- </fileset>
- <doctitle>[Felix Main] API documentation</doctitle>
- <header><b>[Felix Main]</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/**" />
- <fileset file="${basedir}/debian/default.properties"/>
- <service type="org.osgi.framework.launch.FrameworkFactory">
- <provider classname="org.apache.felix.framework.FrameworkFactory"/>
- </service>
- </jar>
-</target>
-</project>
diff --git a/debian/changelog b/debian/changelog
index a693574..5cd5b14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-felix-main (2.0.5-2) UNRELEASED; urgency=low
+felix-main (2.0.5-2) unstable; urgency=low
- * d/build.xml: Fix FTBFS with Ant 1.8.2 (move property in global
- scope and change its name as "java.class.path" clash with default one).
* Bump Standards-Version to 3.9.2: no changes needed.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 08 May 2011 20:40:35 +0200
+ * Use Maven build-system, as upstream:
+ - d/{build.xml,MANIFEST.MF, default.properties, *.install, *.links}: Drop.
+ - d/control: Switch from debhelper to cdbs, add Build-Depends
+ on some Maven plugins.
+ - d/maven.rules,d/maven.ignoreRules: Add handling of pom.xml replace rules.
+ - d/rules: Everything is handled by maven.mk.
+ - d/README.source,d/patches/bootstrap.diff: Add a way to bootstrap without
+ maven-bundle-plugin.
+ * Install Javadoc API to /usr/share/doc/libfelix-framework-java/api/.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 14 May 2011 19:23:02 +0200
felix-main (2.0.5-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 07ca0a0..5df6adb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,12 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
Andres Mejia <mcitadel at gmail.com>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7.3.3), javahelper, default-jdk
-Build-Depends-Indep: ant (>= 1.7.0), libfelix-framework-java, libequinox-osgi-java, maven-repo-helper (>= 1.1)
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4),
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libfelix-framework-java, libfelix-shell-java, libfelix-shell-tui-java, libfelix-bundlerepository-java,
+ libmaven-dependency-plugin-java,
+ libmaven-antrun-plugin-java, ant
Standards-Version: 3.9.2
Homepage: http://felix.apache.org/site/
Vcs-Git: git://git.debian.org/git/pkg-java/felix-main.git
@@ -13,8 +17,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-java/felix-main.git
Package: libfelix-main-java
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends},
- libfelix-framework-java, libequinox-osgi-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
Suggests: libfelix-main-java-doc
Description: Classes to instatiate and execute the Felix Framework
The Felix Framework subproject is an implementation
@@ -23,8 +27,8 @@ Description: Classes to instatiate and execute the Felix Framework
Package: libfelix-main-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Recommends: ${java:Recommends}
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
Description: Javadoc API for classes to instatiate and execute the Felix Framework
The Felix Framework subproject is an implementation
of the OSGi R4.2 core framework specification.
diff --git a/debian/default.properties b/debian/default.properties
deleted file mode 100644
index 7fc8353..0000000
--- a/debian/default.properties
+++ /dev/null
@@ -1,461 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-#
-# Framework config properties.
-#
-org.osgi.framework.system.packages=org.osgi.framework; version=1.5.0, \
- org.osgi.framework.launch; version=1.0.0, \
- org.osgi.framework.hooks.service; version=1.0.0, \
- org.osgi.service.packageadmin; version=1.2.0, \
- org.osgi.service.startlevel; version=1.1.0, \
- org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.4.0 \
- ${jre-${java.specification.version}}
-
-#
-# Java platform package export properties.
-#
-jre-1.3=, \
- javax.accessibility; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- version="1.3.0"
-
-jre-1.4=, \
- javax.accessibility; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.cert; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.w3c.dom; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.4.0"
-
-jre-1.5=, \
- javax.accessibility; \
- javax.activity; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.cert; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version="1.5.0"
-
-jre-1.6=, \
- javax.accessibility; \
- javax.activation; \
- javax.activity; \
- javax.annotation; \
- javax.annotation.processing; \
- javax.crypto; \
- javax.crypto.interfaces; \
- javax.crypto.spec; \
- javax.imageio; \
- javax.imageio.event; \
- javax.imageio.metadata; \
- javax.imageio.plugins.bmp; \
- javax.imageio.plugins.jpeg; \
- javax.imageio.spi; \
- javax.imageio.stream; \
- javax.jws; \
- javax.jws.soap; \
- javax.lang.model; \
- javax.lang.model.element; \
- javax.lang.model.type; \
- javax.lang.model.util; \
- javax.management; \
- javax.management.loading; \
- javax.management.modelmbean; \
- javax.management.monitor; \
- javax.management.openmbean; \
- javax.management.relation; \
- javax.management.remote; \
- javax.management.remote.rmi; \
- javax.management.timer; \
- javax.naming; \
- javax.naming.directory; \
- javax.naming.event; \
- javax.naming.ldap; \
- javax.naming.spi; \
- javax.net; \
- javax.net.ssl; \
- javax.print; \
- javax.print.attribute; \
- javax.print.attribute.standard; \
- javax.print.event; \
- javax.rmi; \
- javax.rmi.CORBA; \
- javax.rmi.ssl; \
- javax.script; \
- javax.security.auth; \
- javax.security.auth.callback; \
- javax.security.auth.kerberos; \
- javax.security.auth.login; \
- javax.security.auth.spi; \
- javax.security.auth.x500; \
- javax.security.cert; \
- javax.security.sasl; \
- javax.sound.midi; \
- javax.sound.midi.spi; \
- javax.sound.sampled; \
- javax.sound.sampled.spi; \
- javax.sql; \
- javax.sql.rowset; \
- javax.sql.rowset.serial; \
- javax.sql.rowset.spi; \
- javax.swing; \
- javax.swing.border; \
- javax.swing.colorchooser; \
- javax.swing.event; \
- javax.swing.filechooser; \
- javax.swing.plaf; \
- javax.swing.plaf.basic; \
- javax.swing.plaf.metal; \
- javax.swing.plaf.multi; \
- javax.swing.plaf.synth; \
- javax.swing.table; \
- javax.swing.text; \
- javax.swing.text.html; \
- javax.swing.text.html.parser; \
- javax.swing.text.rtf; \
- javax.swing.tree; \
- javax.swing.undo; \
- javax.tools; \
- javax.transaction; \
- javax.transaction.xa; \
- javax.xml; \
- javax.xml.bind; \
- javax.xml.bind.annotation; \
- javax.xml.bind.annotation.adapters; \
- javax.xml.bind.attachment; \
- javax.xml.bind.helpers; \
- javax.xml.bind.util; \
- javax.xml.crypto; \
- javax.xml.crypto.dom; \
- javax.xml.crypto.dsig; \
- javax.xml.crypto.dsig.dom; \
- javax.xml.crypto.dsig.keyinfo; \
- javax.xml.crypto.dsig.spec; \
- javax.xml.datatype; \
- javax.xml.namespace; \
- javax.xml.parsers; \
- javax.xml.soap; \
- javax.xml.stream; \
- javax.xml.stream.events; \
- javax.xml.stream.util; \
- javax.xml.transform; \
- javax.xml.transform.dom; \
- javax.xml.transform.sax; \
- javax.xml.transform.stax; \
- javax.xml.transform.stream; \
- javax.xml.validation; \
- javax.xml.ws; \
- javax.xml.ws.handler; \
- javax.xml.ws.handler.soap; \
- javax.xml.ws.http; \
- javax.xml.ws.soap; \
- javax.xml.ws.spi; \
- javax.xml.xpath; \
- org.ietf.jgss; \
- org.omg.CORBA; \
- org.omg.CORBA_2_3; \
- org.omg.CORBA_2_3.portable; \
- org.omg.CORBA.DynAnyPackage; \
- org.omg.CORBA.ORBPackage; \
- org.omg.CORBA.portable; \
- org.omg.CORBA.TypeCodePackage; \
- org.omg.CosNaming; \
- org.omg.CosNaming.NamingContextExtPackage; \
- org.omg.CosNaming.NamingContextPackage; \
- org.omg.Dynamic; \
- org.omg.DynamicAny; \
- org.omg.DynamicAny.DynAnyFactoryPackage; \
- org.omg.DynamicAny.DynAnyPackage; \
- org.omg.IOP; \
- org.omg.IOP.CodecFactoryPackage; \
- org.omg.IOP.CodecPackage; \
- org.omg.Messaging; \
- org.omg.PortableInterceptor; \
- org.omg.PortableInterceptor.ORBInitInfoPackage; \
- org.omg.PortableServer; \
- org.omg.PortableServer.CurrentPackage; \
- org.omg.PortableServer.POAManagerPackage; \
- org.omg.PortableServer.POAPackage; \
- org.omg.PortableServer.portable; \
- org.omg.PortableServer.ServantLocatorPackage; \
- org.omg.SendingContext; \
- org.omg.stub.java.rmi; \
- org.omg.stub.javax.management.remote.rmi; \
- org.w3c.dom; \
- org.w3c.dom.bootstrap; \
- org.w3c.dom.css; \
- org.w3c.dom.events; \
- org.w3c.dom.html; \
- org.w3c.dom.ls; \
- org.w3c.dom.ranges; \
- org.w3c.dom.stylesheets; \
- org.w3c.dom.traversal; \
- org.w3c.dom.views; \
- org.w3c.dom.xpath; \
- org.xml.sax; \
- org.xml.sax.ext; \
- org.xml.sax.helpers; \
- version=\"1.6.0\"
diff --git a/debian/libfelix-main-java-doc.doc-base b/debian/libfelix-main-java-doc.doc-base
index dbec2fb..0a21ccd 100644
--- a/debian/libfelix-main-java-doc.doc-base
+++ b/debian/libfelix-main-java-doc.doc-base
@@ -4,5 +4,5 @@ Author: The Apache Software Foundation Main Classes
Section: Programming/Java
Format: HTML
-Index: /usr/share/doc/libfelix-main-java-doc/api/index.html
-Files: /usr/share/doc/libfelix-main-java-doc/api/*.html
+Index: /usr/share/doc/libfelix-main-java/api/index.html
+Files: /usr/share/doc/libfelix-main-java/api/*.html
diff --git a/debian/libfelix-main-java-doc.docs b/debian/libfelix-main-java-doc.docs
index cfccac8..30d29de 100644
--- a/debian/libfelix-main-java-doc.docs
+++ b/debian/libfelix-main-java-doc.docs
@@ -1,2 +1 @@
-build/doc/*
-doc/*
\ No newline at end of file
+doc/*
diff --git a/debian/libfelix-main-java-doc.install b/debian/libfelix-main-java-doc.install
new file mode 100644
index 0000000..a0e42f0
--- /dev/null
+++ b/debian/libfelix-main-java-doc.install
@@ -0,0 +1 @@
+target/apidocs/* /usr/share/doc/libfelix-main-java/api/
diff --git a/debian/libfelix-main-java.install b/debian/libfelix-main-java.install
deleted file mode 100644
index 8fc3b66..0000000
--- a/debian/libfelix-main-java.install
+++ /dev/null
@@ -1 +0,0 @@
-dist/* usr/share/java
diff --git a/debian/libfelix-main-java.links b/debian/libfelix-main-java.links
deleted file mode 100644
index 6e5d163..0000000
--- a/debian/libfelix-main-java.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/java/org.apache.felix.main-2.0.5.jar /usr/share/java/org.apache.felix.main.jar
-
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..d07c159
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,20 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
+# Only for bootstrapping
+#org.apache.felix maven-bundle-plugin * * * *
+
+org.codehaus.mojo rat-maven-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..53a8f8a
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,3 @@
+# Include here properties to pass to Maven during the build.
+maven.test.skip=true
+
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8b070c7
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,21 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
+s/org.osgi/org.eclipse.osgi/ s/org.osgi.compendium/org.eclipse.osgi.services/ jar s/.*/debian/ * *
+s/org.osgi/org.eclipse.osgi/ s/org.osgi.core/org.eclipse.osgi/ jar s/.*/debian/ * *
+
diff --git a/debian/patches/bootstrap_packaging_jar.diff b/debian/patches/bootstrap_packaging_jar.diff
new file mode 100644
index 0000000..23dd233
--- /dev/null
+++ b/debian/patches/bootstrap_packaging_jar.diff
@@ -0,0 +1,18 @@
+Description: pom.xml, change packaging type from bundle to jar.
+ Since this library is a dependency of maven-bundle-plugin
+ we should use default "jar" packaging type to allow a first bootstrap build.
+Forwarded: not-needed
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-05-11
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -24,7 +24,7 @@
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+- <packaging>bundle</packaging>
++ <packaging>jar</packaging>
+ <name>Apache Felix Main</name>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>2.0.5</version>
diff --git a/debian/patches/default_version.diff b/debian/patches/default_version.diff
new file mode 100644
index 0000000..7e59169
--- /dev/null
+++ b/debian/patches/default_version.diff
@@ -0,0 +1,17 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -109,10 +109,10 @@
+ <properties>
+ <log.level>1</log.level>
+ <dollar>$</dollar>
+- <framework.version>2.0.5</framework.version>
+- <shell.version>1.4.2</shell.version>
+- <shell.tui.version>1.4.1</shell.tui.version>
+- <obr.version>1.4.3</obr.version>
++ <framework.version>debian</framework.version>
++ <shell.version>debian</shell.version>
++ <shell.tui.version>debian</shell.tui.version>
++ <obr.version>debian</obr.version>
+ </properties>
+ <profiles>
+ <profile>
diff --git a/debian/patches/pom.patch b/debian/patches/pom.patch
deleted file mode 100644
index 063ca65..0000000
--- a/debian/patches/pom.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Index: felix-main-2.0.5/pom.xml
-===================================================================
---- felix-main-2.0.5.orig/pom.xml 2010-07-27 14:03:50.000000000 +0400
-+++ felix-main-2.0.5/pom.xml 2010-07-27 14:06:46.000000000 +0400
-@@ -33,77 +33,6 @@
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${framework.version}</version>
-- <exclusions>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- </exclusion>
-- </exclusions>
-- </dependency>
-- <dependency>
-- <groupId>${pom.groupId}</groupId>
-- <artifactId>org.apache.felix.shell</artifactId>
-- <version>${shell.version}</version>
-- <exclusions>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- </exclusion>
-- </exclusions>
-- </dependency>
-- <dependency>
-- <groupId>${pom.groupId}</groupId>
-- <artifactId>org.apache.felix.shell.tui</artifactId>
-- <version>${shell.tui.version}</version>
-- <exclusions>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- </exclusion>
-- </exclusions>
-- </dependency>
-- <dependency>
-- <groupId>${pom.groupId}</groupId>
-- <artifactId>org.apache.felix.bundlerepository</artifactId>
-- <version>${obr.version}</version>
-- <exclusions>
-- <exclusion>
-- <groupId>${pom.groupId}</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>${pom.groupId}</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.core</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>org.osgi</groupId>
-- <artifactId>org.osgi.compendium</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>${pom.groupId}</groupId>
-- <artifactId>org.osgi.service.obr</artifactId>
-- </exclusion>
-- <exclusion>
-- <groupId>net.sf.kxml</groupId>
-- <artifactId>kxml2</artifactId>
-- </exclusion>
-- </exclusions>
- </dependency>
- </dependencies>
- <properties>
diff --git a/debian/patches/series b/debian/patches/series
index df4e068..f52496f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
-pom.patch
+# Only for bootstrapping
+#bootstrap_packaging_jar.diff
+default_version.diff
diff --git a/debian/rules b/debian/rules
index 5d4b540..bbe9a99 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,35 +1,9 @@
#!/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/org.apache.felix.framework.jar:/usr/share/java/org.eclipse.osgi.jar
-JAR_NAME := org.apache.felix.main
-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)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-%:
- dh $@ --with javahelper
-
-override_dh_auto_build:
- ant \
- $(ANT_ARGS) \
- -f $(ANT_BUILDFILE) $(ANT_BUILD_TARGET)
-
-override_dh_install:
- mh_installpoms -plibfelix-main-java
- mh_installjar -plibfelix-main-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
+JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
uscan \
hooks/post-receive
--
felix-main packaging
More information about the pkg-java-commits
mailing list