[bnd] 01/02: * New upstream release. * d/control: Add Build-Depends on libbindex-java. * d/{bootstrap, rules}: Add bindex.jar to classpath. * d/patches/no_git_during_build.diff: Don't try to use GIT during build. * d/patches/osgi43_fixes.diff: Some fixes for libosgi-core-java >= 4.3. * d/patches/no_felix.diff: Drop dependency on felix-framework (to remove dependency cycle).
Miguel Landaeta
nomadium at moszumanska.debian.org
Tue Mar 10 18:12:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to annotated tag debian/1.50.0-2
in repository bnd.
commit e79329f756bcdd6141cc8de3691d4ef64cfed854
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed Nov 9 21:47:03 2011 +0000
* New upstream release.
* d/control: Add Build-Depends on libbindex-java.
* d/{bootstrap,rules}: Add bindex.jar to classpath.
* d/patches/no_git_during_build.diff: Don't try to use GIT during build.
* d/patches/osgi43_fixes.diff: Some fixes for libosgi-core-java >= 4.3.
* d/patches/no_felix.diff: Drop dependency on felix-framework (to remove
dependency cycle).
---
debian/bootstrap.xml | 4 +-
debian/changelog | 12 +++++
debian/control | 10 ++--
debian/copyright | 1 -
debian/git-transform.sh | 3 ++
debian/orig-tar.sh | 8 +--
debian/patches/no_ee_minimum.diff | 19 +++++--
debian/patches/no_felix.diff | 20 ++++++++
debian/patches/no_git_during_build.diff | 19 +++++++
debian/patches/osgi43_fixes.diff | 88 +++++++++++++++++++++++++++++++++
debian/patches/series | 3 ++
debian/rules | 6 ++-
12 files changed, 175 insertions(+), 18 deletions(-)
diff --git a/debian/bootstrap.xml b/debian/bootstrap.xml
index 8fc7e92..6d69a47 100644
--- a/debian/bootstrap.xml
+++ b/debian/bootstrap.xml
@@ -10,8 +10,7 @@
<mkdir dir="bootstrap/build"/>
<javac
destdir="bootstrap/build"
- classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar">
-
+ classpath="/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar:/usr/share/java/bindex.jar">
<src path="aQute.libg/src"/>
<src path="biz.aQute.bndlib/src"/>
<src path="biz.aQute.bnd/src"/>
@@ -23,7 +22,6 @@
<exclude name="swing2swt/**"/>
<exclude name="biz/aqute/bnd/eclipse/**"/>
<exclude name="test/**"/>
-
</javac>
<copy
todir="bootstrap/build/aQute/bnd/ant/"
diff --git a/debian/changelog b/debian/changelog
index 8d48d7e..20ea0eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+bnd (1.50.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * d/control: Add Build-Depends on libbindex-java.
+ * d/{bootstrap,rules}: Add bindex.jar to classpath.
+ * d/patches/no_git_during_build.diff: Don't try to use GIT during build.
+ * d/patches/osgi43_fixes.diff: Some fixes for libosgi-core-java >= 4.3.
+ * d/patches/no_felix.diff: Drop dependency on felix-framework (to remove
+ dependency cycle).
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 09 Nov 2011 22:39:08 +0100
+
bnd (1.44.0-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/control b/debian/control
index c530d76..5fa00b3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,9 @@ Build-Depends: ant,
eclipse-rcp,
javahelper,
junit,
- libosgi-compendium-java,
- libosgi-core-java,
+ libbindex-java (>= 2.2+svn101),
+ libosgi-compendium-java (>= 4.3.0),
+ libosgi-core-java (>= 4.3.0),
libswt-gtk-3-java,
maven-ant-helper,
maven-repo-helper
@@ -27,9 +28,10 @@ Package: bnd
Architecture: all
Depends: default-jre-headless | java5-runtime-headless | openjdk-6-jdk,
java-wrappers,
- libosgi-compendium-java,
- libosgi-core-java,
+ libosgi-compendium-java (>= 4.3.0),
+ libosgi-core-java (>= 4.3.0),
${misc:Depends}
+Recommends: libbindex-java (>= 2.2+svn101)
Suggests: eclipse-jdt, eclipse-rcp
Description: tool to create and diagnose OSGi R4 bundles
The bnd tool helps you create and diagnose OSGi R4 bundles.
diff --git a/debian/copyright b/debian/copyright
index bfcd0bc..ac996b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -299,4 +299,3 @@ License: BSD-3-clause
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/debian/git-transform.sh b/debian/git-transform.sh
index e15946d..4b6de2b 100644
--- a/debian/git-transform.sh
+++ b/debian/git-transform.sh
@@ -24,6 +24,9 @@ rm -rf $DEST/biz.aQute.bndlib/jar/
# Remove Eclipse compiler, not needed and under EPL-v1
rm -rf $DEST/biz.aQute.eclipse.compiler
+# Remove bld (to many dependencies)
+rm -rf $DEST/biz.aQute.bld
+
# Cleanup of binary blobs
rm -rf $DEST/biz.aQute.bndlib/test/maven-repo/
rm -rf $DEST/biz.aQute.bndlib/src/test/*.jclass
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index c40f143..bf78d35 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,10 +3,10 @@
VERSION=$2
TAR=../bnd_$VERSION.orig.tar.gz
DIR=bnd-$VERSION
-GIT_DIR=/home/drazzib/incoming/bnd-git
+GIT_DIR=bnd-git
-DATE=2011-07-01
-git clone git://github.com/bnd/bnd.git $GIT_DIR
+DATE=2011-11-04
+git clone git://github.com/bndtools/bnd.git $GIT_DIR
(
cd $GIT_DIR
git checkout `git rev-list -n 1 --before="$DATE" master`
@@ -18,5 +18,5 @@ debian/git-transform.sh $GIT_DIR $DIR
tar -c -z -f $TAR $DIR
rm -rf $DIR
-#rm -rf $GIT_DIR
+rm -rf $GIT_DIR
diff --git a/debian/patches/no_ee_minimum.diff b/debian/patches/no_ee_minimum.diff
index 090e280..95220a0 100644
--- a/debian/patches/no_ee_minimum.diff
+++ b/debian/patches/no_ee_minimum.diff
@@ -3,6 +3,18 @@ Description: Don't request ee.minimum since we have a full
Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2011-10-26
Forwarded: no
+Index: b/biz.aQute.bndlib/bnd.bnd
+===================================================================
+--- a/biz.aQute.bndlib/bnd.bnd
++++ b/biz.aQute.bndlib/bnd.bnd
+@@ -34,7 +34,6 @@
+ osgi.cmpn;version=4.3,\
+ aQute.libg;version=project,\
+ osgi.core;version=4.1, \
+- ee.j2se; version=1.5, \
+ org.osgi.impl.bundle.bindex
+
+ Bundle-Version: 1.49.0
Index: b/biz.aQute.junit/bnd.bnd
===================================================================
--- a/biz.aQute.junit/bnd.bnd
@@ -28,12 +40,11 @@ Index: b/demo/bnd.bnd
-testpath: \
biz.aQute.junit; version=snapshot
-@@ -25,6 +23,5 @@
+@@ -25,7 +23,6 @@
*
-buildpath: osgi.core,\
- ee.minimum;version=1.2.1,\
junit.osgi
--
-\ No newline at end of file
-+
+
+ javac.target=1.4
diff --git a/debian/patches/no_felix.diff b/debian/patches/no_felix.diff
new file mode 100644
index 0000000..7dca61d
--- /dev/null
+++ b/debian/patches/no_felix.diff
@@ -0,0 +1,20 @@
+Description: Don't depends on felix for runtime
+ to break dependencies-cycles.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-11-09
+Forwarded: no
+
+Index: b/demo/bnd.bnd
+===================================================================
+--- a/demo/bnd.bnd
++++ b/demo/bnd.bnd
+@@ -11,9 +11,6 @@
+ org.eclipse.osgi, \
+ biz.aQute.launcher; version=snapshot
+
+--runbundles: org.apache.felix.scr,\
+- org.apache.felix.configadmin
+-
+
+ Bundle-Activator: test.TestActivator
+ Private-Package: test
diff --git a/debian/patches/no_git_during_build.diff b/debian/patches/no_git_during_build.diff
new file mode 100644
index 0000000..1efe381
--- /dev/null
+++ b/debian/patches/no_git_during_build.diff
@@ -0,0 +1,19 @@
+Description: Don't embed Git SHASUM in build MANIFEST.MF
+ since our tarball doesn't contains git metadata.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-11-09
+Forwarded: no
+
+Index: b/cnf/build.bnd
+===================================================================
+--- a/cnf/build.bnd
++++ b/cnf/build.bnd
+@@ -1,6 +1,6 @@
+ # We use git
+-Git-Descriptor: ${system;git describe --dirty --always}
+-Git-SHA: ${system;git rev-list -1 HEAD}
++#Git-Descriptor: ${system;git describe --dirty --always}
++#Git-SHA: ${system;git rev-list -1 HEAD}
+
+ Bundle-SCM = git://github.com/bndtools/bnd.git
+
diff --git a/debian/patches/osgi43_fixes.diff b/debian/patches/osgi43_fixes.diff
new file mode 100644
index 0000000..ac1320a
--- /dev/null
+++ b/debian/patches/osgi43_fixes.diff
@@ -0,0 +1,88 @@
+Description: Implements some missing methods for OSGi R4.3
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-11-09
+Forwarded: no
+
+Index: b/biz.aQute.launcher/src/aQute/launcher/Launcher.java
+===================================================================
+--- a/biz.aQute.launcher/src/aQute/launcher/Launcher.java
++++ b/biz.aQute.launcher/src/aQute/launcher/Launcher.java
+@@ -458,7 +458,7 @@
+ Class<?> clazz = loader.loadClass(implementation);
+ FrameworkFactory factory = (FrameworkFactory) clazz.newInstance();
+ trace("Framework factory %s", factory);
+- systemBundle = factory.newFramework(p);
++ systemBundle = factory.newFramework((java.util.Map)p);
+ trace("framework instance %s", systemBundle);
+ } else {
+ trace("using embedded mini framework because we were told not to use META-INF/services");
+Index: b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
+===================================================================
+--- a/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/Context.java
+@@ -331,4 +331,30 @@
+ public String toString() {
+ return id + " " + location;
+ }
++
++ public <A> A adapt(java.lang.Class<A> type) {
++ return null;
++ }
++
++ public int compareTo(Bundle bundle) {
++ return 0;
++ }
++
++ public Bundle getBundle(java.lang.String location) {
++ return null;
++ }
++
++ public <S> ServiceReference<S> getServiceReference(java.lang.Class<S> clazz) {
++ return null;
++ }
++
++ public <S> java.util.Collection<ServiceReference<S>> getServiceReferences(java.lang.Class<S> clazz, String filter)
++ throws InvalidSyntaxException {
++ return null;
++ }
++
++ public <S> ServiceRegistration<S> registerService(java.lang.Class<S> clazz, S service,
++ java.util.Dictionary<java.lang.String,?> properties) {
++ throw new UnsupportedOperationException();
++ }
+ }
+Index: b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
+===================================================================
+--- a/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
++++ b/biz.aQute.launcher/src/aQute/launcher/minifw/MiniFramework.java
+@@ -290,4 +290,30 @@
+ throw new ClassNotFoundException(name);
+ }
+ }
++
++ public <A> A adapt(java.lang.Class<A> type) {
++ return null;
++ }
++
++ public int compareTo(Bundle bundle) {
++ return 0;
++ }
++
++ public Bundle getBundle(java.lang.String location) {
++ return null;
++ }
++ public <S> ServiceReference<S> getServiceReference(java.lang.Class<S> clazz) {
++ return null;
++ }
++
++ public <S> java.util.Collection<ServiceReference<S>> getServiceReferences(java.lang.Class<S> clazz, String filter)
++ throws InvalidSyntaxException {
++ return null;
++ }
++
++ public <S> ServiceRegistration<S> registerService(java.lang.Class<S> clazz, S service,
++ java.util.Dictionary<java.lang.String,?> properties) {
++ throw new UnsupportedOperationException();
++ }
++
+ }
diff --git a/debian/patches/series b/debian/patches/series
index d06efe4..13f8c9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,5 @@
build_excludes.diff
no_ee_minimum.diff
+no_felix.diff
+no_git_during_build.diff
+osgi43_fixes.diff
diff --git a/debian/rules b/debian/rules
index 2ebda31..482ca40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,13 +49,14 @@ debian/stamp-bootstrap:
cnf/repo/org.eclipse.ui.ide \
cnf/repo/org.eclipse.core.jobs \
cnf/repo/org.eclipse.text \
- cnf/repo/org.eclipse.swt.carbon.macosx
+ cnf/repo/org.eclipse.swt.carbon.macosx \
+ cnf/repo/org.osgi.impl.bundle.bindex
ln -s $(CURDIR)/bootstrap/bnd.jar cnf/repo/biz.aQute.bnd/biz.aQute.bnd-latest.jar
ln -s /usr/share/java/junit.jar cnf/repo/com.springsource.junit/com.springsource.junit-3.8.2.jar
ln -s /usr/share/java/junit.jar cnf/repo/junit.osgi/junit.osgi-3.8.2.jar
ln -s /usr/share/java/osgi.core.jar cnf/repo/org.eclipse.osgi/org.eclipse.osgi-3.5.0.jar
ln -s /usr/share/java/osgi.core.jar cnf/repo/osgi.core/osgi.core-4.2.1.jar
- ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.2.1.jar
+ ln -s /usr/share/java/osgi.compendium.jar cnf/repo/osgi.cmpn/osgi.cmpn-4.3.0.jar
# ln -s /usr/share/java/ee.foundation.jar cnf/repo/ee.minimum/ee.minimum-1.2.1.jar
ln -s /usr/share/java/ant.jar cnf/repo/org.apache.tools.ant/org.apache.tools.ant-1.7.1.jar
ln -s /usr/lib/eclipse/plugins/org.eclipse.core.runtime_*.jar cnf/repo/org.eclipse.core.runtime/org.eclipse.core.runtime-3.3.100.jar
@@ -81,6 +82,7 @@ debian/stamp-bootstrap:
ln -s /usr/lib/eclipse/plugins/org.eclipse.core.jobs_*.jar cnf/repo/org.eclipse.core.jobs/org.eclipse.core.jobs-3.3.1.jar
ln -s /usr/lib/eclipse/plugins/org.eclipse.text_*.jar cnf/repo/org.eclipse.text/org.eclipse.text-3.5.100.jar
ln -s /usr/lib/eclipse/plugins/org.eclipse.swt.*_*.jar cnf/repo/org.eclipse.swt.carbon.macosx/org.eclipse.swt.carbon.macosx-3.3.3.jar
+ ln -s /usr/share/java/bindex.jar cnf/repo/org.osgi.impl.bundle.bindex/org.osgi.impl.bundle.bindex-2.2.0.jar
touch $@
clean-bootstrap: DEB_BUILDDIR=$(CURDIR)
clean-bootstrap: DEB_ANT_BUILDFILE=$(CURDIR)/debian/bootstrap.xml
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git
More information about the pkg-java-commits
mailing list