[bnd] 01/01: Refresh patches for 2.1.0-1 upload
Miguel Landaeta
nomadium at moszumanska.debian.org
Fri Apr 24 14:51:13 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository bnd.
commit 4601b590f47d1a000c60c5f64db3c837df52ea2d
Author: Miguel Landaeta <nomadium at debian.org>
Date: Mon Apr 13 16:22:26 2015 -0300
Refresh patches for 2.1.0-1 upload
---
debian/changelog | 9 ++-
debian/control | 2 +-
debian/git-transform.sh | 0
debian/orig-tar.sh | 3 +-
debian/patches/ant-1.9-compatibility.diff | 31 +++-----
debian/patches/build_excludes.diff | 2 +-
debian/patches/display_bsn_on_missing_bundle.diff | 26 ++++---
debian/patches/no_ee_minimum.diff | 49 +++++++------
debian/patches/no_felix.diff | 6 +-
debian/patches/no_git_during_build.diff | 8 +--
debian/patches/series | 6 +-
debian/pom-annotation.xml | 34 +++------
debian/pom-bnd.xml | 63 ++++++++++-------
debian/pom-bndlib.xml | 86 ++++++++---------------
debian/rules | 8 +--
15 files changed, 150 insertions(+), 183 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e672428..3d696b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-bnd (1.50.0-8.1) UNRELEASED; urgency=medium
+bnd (2.1.0-1) experimental; urgency=medium
- * Non-maintainer upload.
- * Moved the package to Git
+ * Team upload.
+ * New upstream release.
+ * Bump Standards-Version to 3.9.6. No changes were required.
+ * Moved the package to Git.
+ * Refresh patches.
-- Miguel Landaeta <nomadium at debian.org> Tue, 10 Mar 2015 15:10:19 -0300
diff --git a/debian/control b/debian/control
index a5a4af2..d202d94 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: ant,
libswt-gtk-3-java,
maven-ant-helper,
maven-repo-helper
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/bnd.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/bnd.git
Homepage: http://www.aQute.biz/Bnd
diff --git a/debian/git-transform.sh b/debian/git-transform.sh
old mode 100644
new mode 100755
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index bf78d35..a8fdd07 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -5,11 +5,10 @@ TAR=../bnd_$VERSION.orig.tar.gz
DIR=bnd-$VERSION
GIT_DIR=bnd-git
-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`
+ git checkout "${VERSION}.REL"
)
# Bnd git cleanup
diff --git a/debian/patches/ant-1.9-compatibility.diff b/debian/patches/ant-1.9-compatibility.diff
index 4cf9ed2..e52e159 100644
--- a/debian/patches/ant-1.9-compatibility.diff
+++ b/debian/patches/ant-1.9-compatibility.diff
@@ -2,29 +2,18 @@ Description: Ensures the source compatibility with Ant 1.9.
This patch can be removed when upgrading to bnd 2.x.
Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: not-needed
---- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-+++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-@@ -1373,7 +1373,7 @@
- }
-
- public boolean doWrap(File properties, File bundle, File output, File classpath[], int options,
-- Map<String, String> additional) throws Exception {
-+ Map<String, Object> additional) throws Exception {
- if (!bundle.exists()) {
- error("No such file: " + bundle.getAbsolutePath());
- return false;
---- a/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
-+++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
-@@ -1527,9 +1527,9 @@
+--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
++++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
+@@ -1572,9 +1572,9 @@ public class Analyzer extends Processor {
return sb.toString();
}
-- public void putAll(Map<String, String> additional, boolean force) {
-- for (Iterator<Map.Entry<String, String>> i = additional.entrySet().iterator(); i.hasNext();) {
-- Map.Entry<String, String> entry = i.next();
-+ public void putAll(Map<String, Object> additional, boolean force) {
-+ for (Iterator<Map.Entry<String, Object>> i = additional.entrySet().iterator(); i.hasNext();) {
-+ Map.Entry<String, Object> entry = i.next();
+- public void putAll(Map<String,String> additional, boolean force) {
+- for (Iterator<Map.Entry<String,String>> i = additional.entrySet().iterator(); i.hasNext();) {
+- Map.Entry<String,String> entry = i.next();
++ public void putAll(Map<String,Object> additional, boolean force) {
++ for (Iterator<Map.Entry<String,Object>> i = additional.entrySet().iterator(); i.hasNext();) {
++ Map.Entry<String,Object> entry = i.next();
if (force || getProperties().get(entry.getKey()) == null)
- setProperty((String) entry.getKey(), (String) entry.getValue());
+ setProperty(entry.getKey(), entry.getValue());
}
diff --git a/debian/patches/build_excludes.diff b/debian/patches/build_excludes.diff
index f5e295b..31a3483 100644
--- a/debian/patches/build_excludes.diff
+++ b/debian/patches/build_excludes.diff
@@ -7,7 +7,7 @@ Index: b/cnf/build.xml
===================================================================
--- a/cnf/build.xml
+++ b/cnf/build.xml
-@@ -49,7 +49,7 @@
+@@ -75,7 +75,7 @@
-->
<target name="compile" depends="dependencies" if="project.sourcepath">
<mkdir dir="${project.output}" />
diff --git a/debian/patches/display_bsn_on_missing_bundle.diff b/debian/patches/display_bsn_on_missing_bundle.diff
index f2b1716..8ca3230 100644
--- a/debian/patches/display_bsn_on_missing_bundle.diff
+++ b/debian/patches/display_bsn_on_missing_bundle.diff
@@ -4,26 +4,24 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
Last-Update: 2012-01-17
--- a/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/build/Project.java
-@@ -977,8 +977,11 @@
- File file = plugin.get(bsn, range, useStrategy, attrs);
+@@ -878,8 +878,11 @@ public class Project extends Processor {
+ File file = plugin.get(bsn, version, attrs, blocker);
// and the entry must exist
// if it does, return this as a result
- if (file != null)
+ if (file != null) {
- return toContainer(bsn, range, attrs, file);
+ return toContainer(bsn, range, attrs, file, blocker);
+ } else {
-+ System.err.println("Missing: " + bsn + " " + range);
++ System.err.println("Missing: " + bsn + " " + range);
+ }
}
}
}
-@@ -1002,6 +1005,9 @@
- RepositoryPlugin repo = versions.get(provider);
- String version = provider.toString();
- File result = repo.get(bsn, version, Strategy.EXACT, attrs);
-+ if (result == null) {
-+ System.err.println("Missing: " + bsn + " " + range);
-+ }
- return toContainer(bsn, version, attrs, result);
- } else
- error("Unexpected, found versions %s but then not provider for startegy %s?",
+On branch master
+Changes not staged for commit:
+ (use "git add <file>..." to update what will be committed)
+ (use "git checkout -- <file>..." to discard changes in working directory)
+
+ modified: biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
+
+no changes added to commit (use "git add" and/or "git commit -a")
diff --git a/debian/patches/no_ee_minimum.diff b/debian/patches/no_ee_minimum.diff
index 95220a0..0d21c0b 100644
--- a/debian/patches/no_ee_minimum.diff
+++ b/debian/patches/no_ee_minimum.diff
@@ -3,44 +3,47 @@ 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
-===================================================================
+diff --git a/biz.aQute.bndlib/bnd.bnd b/biz.aQute.bndlib/bnd.bnd
+index e583927..49d247f 100644
--- a/biz.aQute.bndlib/bnd.bnd
+++ b/biz.aQute.bndlib/bnd.bnd
-@@ -34,7 +34,6 @@
- osgi.cmpn;version=4.3,\
+@@ -44,7 +44,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
aQute.libg;version=project,\
- osgi.core;version=4.1, \
-- ee.j2se; version=1.5, \
- org.osgi.impl.bundle.bindex
+ osgi.core;version=4.1,\
+ osgi.r5;version=1.0.1,\
+- ee.j2se;version=${javac.ee}
- Bundle-Version: 1.49.0
-Index: b/biz.aQute.junit/bnd.bnd
-===================================================================
+ Bundle-Version: 2.1.0.${tstamp;yyyyMMdd-HHmmss}
+ Import-Package: junit.framework;resolution:=optional,\
+diff --git a/biz.aQute.junit/bnd.bnd b/biz.aQute.junit/bnd.bnd
+index f749234..e6a3e85 100644
--- a/biz.aQute.junit/bnd.bnd
+++ b/biz.aQute.junit/bnd.bnd
-@@ -1,5 +1,4 @@
- -buildpath: com.springsource.junit,\
-- ee.minimum;version=1.2.1,\
+@@ -2,8 +2,7 @@
osgi.cmpn;version=4.2.1,\
biz.aQute.bndlib;version=project,\
aQute.libg;version=project,\
-Index: b/demo/bnd.bnd
-===================================================================
+- osgi.core;version=4.2.1,\
+- ee.j2se;version=${javac.ee}
++ osgi.core;version=4.2.1
+
+ Tester-Plugin: aQute.junit.plugin.ProjectTesterImpl
+
+diff --git a/demo/bnd.bnd b/demo/bnd.bnd
+index 6a7086a..9819530 100644
--- a/demo/bnd.bnd
+++ b/demo/bnd.bnd
-@@ -2,9 +2,7 @@
- Bundle-Activator: com.example.demo.Activator
+@@ -3,8 +3,7 @@ Bundle-Activator: com.example.demo.Activator
Bundle-SymbolicName: demo
---buildpath: osgi.core,\
-- ee.minimum;version=1.2.1
--
-+-buildpath: osgi.core
+ -buildpath: osgi.core,\
+- ee.minimum;version=1.2.1,\
+- ee.j2se;version=${javac.ee}
++ ee.minimum;version=1.2.1
+
-testpath: \
- biz.aQute.junit; version=snapshot
-@@ -25,7 +23,6 @@
+@@ -25,7 +24,6 @@ Import-Package: \
*
-buildpath: osgi.core,\
diff --git a/debian/patches/no_felix.diff b/debian/patches/no_felix.diff
index 7dca61d..9acca81 100644
--- a/debian/patches/no_felix.diff
+++ b/debian/patches/no_felix.diff
@@ -8,8 +8,8 @@ Index: b/demo/bnd.bnd
===================================================================
--- a/demo/bnd.bnd
+++ b/demo/bnd.bnd
-@@ -11,9 +11,6 @@
- org.eclipse.osgi, \
+@@ -13,9 +13,6 @@ Bundle-SymbolicName: demo
+ org.apache.felix.framework;version='[2.0.5,2.0.5]', \
biz.aQute.launcher; version=snapshot
--runbundles: org.apache.felix.scr,\
@@ -17,4 +17,4 @@ Index: b/demo/bnd.bnd
-
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
index 1efe381..d57528d 100644
--- a/debian/patches/no_git_during_build.diff
+++ b/debian/patches/no_git_during_build.diff
@@ -10,10 +10,10 @@ Index: b/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}
+-Git-Descriptor: ${system-allow-fail;git describe --dirty --always}
+-Git-SHA: ${system-allow-fail;git rev-list -1 HEAD}
++#Git-Descriptor: ${system-allow-fail;git describe --dirty --always}
++#Git-SHA: ${system-allow-fail;git rev-list -1 HEAD}
Bundle-SCM = git://github.com/bndtools/bnd.git
diff --git a/debian/patches/series b/debian/patches/series
index 5ba6ed3..3408f36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,9 +2,9 @@ build_excludes.diff
no_ee_minimum.diff
no_felix.diff
no_git_during_build.diff
-osgi43_fixes.diff
+#osgi43_fixes.diff
display_bsn_on_missing_bundle.diff
-find_swt_jar.diff
+#find_swt_jar.diff
fix-encoding.diff
ant-1.9-compatibility.diff
-java8-compatibility.diff
+#java8-compatibility.diff
diff --git a/debian/pom-annotation.xml b/debian/pom-annotation.xml
index 5a41b93..e17c606 100644
--- a/debian/pom-annotation.xml
+++ b/debian/pom-annotation.xml
@@ -1,30 +1,17 @@
-<project xmlns='http://maven.apache.org/POM/4.0.0'
-xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
-
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
<modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
+
+ <parent>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.0</version>
+ </parent>
+
<artifactId>annotation</artifactId>
- <version>1.50.0</version>
<name>bnd Annotations Library</name>
<description>The annotations for bnd.</description>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <scm>
- <url>git://github.com/bndtools/bnd.git</url>
- <connection>scm:git:git://github.com/bndtools/bnd.git</connection>
- </scm>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <developers>
- <developer>
- <id>Peter.Kriens at aQute.biz</id>
- <name>Peter.Kriens</name>
- <email>Peter.Kriens at aQute.biz</email>
- <organization>aQute</organization>
- </developer>
- </developers>
+
<licenses>
<license>
<name>Apache Software License 2.0</name>
@@ -32,4 +19,5 @@ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<distribution>repo</distribution>
</license>
</licenses>
+
</project>
diff --git a/debian/pom-bnd.xml b/debian/pom-bnd.xml
index 89b03c1..bf9ba61 100644
--- a/debian/pom-bnd.xml
+++ b/debian/pom-bnd.xml
@@ -1,34 +1,45 @@
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
<modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
+
+ <parent>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.0</version>
+ </parent>
+
<artifactId>bnd</artifactId>
- <version>1.50.0</version>
- <packaging>jar</packaging>
- <description>A utility and plugin to wrap, build, or print bundles</description>
<name>aQute Bundle Tool</name>
- <url>http://www.aQute.biz/Code/Bnd</url>
- <scm>
- <url>https://github.com/bndtools/bnd</url>
- <connection>scm:git:git://github.com/bndtools/bnd.git</connection>
- </scm>
- <organization>
- <name>aQute SARL</name>
- <url>http://www.aQute.biz</url>
- </organization>
- <developers>
- <developer>
- <name>Peter Kriens</name>
- <email>peter.kriens at aqute.biz</email>
- <roles>
- <role>Primary Developer</role>
- </roles>
- </developer>
- </developers>
+ <description>
+ A command line utility and Ant plugin to wrap, build, or examine bundles.
+ </description>
+
<licenses>
<license>
- <name>All files contained in this JAR are licensed under the Apache 2.0 license, unless noted differently in their source (see swing2swt).</name>
- <url>http://www.opensource.org/licenses/apache2.0.php</url>
- <distribution>repo</distribution>
+ <name>All files contained in this JAR are licensed under the Apache 2.0 license, unless noted differently in their source (see swing2swt).</name>
+ <url>http://www.opensource.org/licenses/apache2.0.php</url>
+ <distribution>repo</distribution>
</license>
</licenses>
+
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/debian/pom-bndlib.xml b/debian/pom-bndlib.xml
index 7ab4513..0a83023 100644
--- a/debian/pom-bndlib.xml
+++ b/debian/pom-bndlib.xml
@@ -1,64 +1,40 @@
-
-<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
<modelVersion>4.0.0</modelVersion>
- <groupId>biz.aQute</groupId>
+
+ <parent>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.0</version>
+ </parent>
+
<artifactId>bndlib</artifactId>
- <version>1.50.0</version>
+ <name>A Swiss Army Knife for OSGi</name>
<description>
- A Swiss Army Knife for OSGi
+ The bndlib project is a general library to be used with OSGi bundles. It contains
+ lots of cool functionality that calculates dependencies, etc.
</description>
- <name>
- bnd - Bundle Tool
- </name>
- <url>
- http://www.aQute.biz/Code/Bnd
- </url>
- <scm>
- <url>
- git://github.com/bndtools/bnd.git
- </url>
- <connection>
- git://github.com/bndtools/bnd.git
- </connection>
- <developerConnection>
- git://github.com/bndtools/bnd.git
- </developerConnection>
- </scm>
- <organization>
- <name>
- aQute SARL
- </name>
- <url>
- http://www.aQute.biz
- </url>
- </organization>
- <developers>
- <developer>
- <id>
- Peter.Kriens at aQute.biz
- </id>
- <name>
- Peter.Kriens
- </name>
- <email>
- Peter.Kriens at aQute.biz
- </email>
- <organization>
- aQute
- </organization>
- </developer>
- </developers>
+
<licenses>
<license>
- <name>
- Apache Software License 2.0
- </name>
- <url>
- http://www.opensource.org/licenses/apache2.0.php
- </url>
- <distribution>
- repo
- </distribution>
+ <name>Apache Software License 2.0</name>
+ <url>http://www.opensource.org/licenses/apache2.0.php</url>
+ <distribution>repo</distribution>
</license>
</licenses>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/debian/rules b/debian/rules
index b869dc1..7364338 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
MAVEN_REPO := http://repo1.maven.org/maven2/biz/aQute/
-MAVEN_VERSION := 1.50.0
+MAVEN_VERSION := 2.1.0
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
@@ -121,8 +121,8 @@ get-orig-source:
debian/orig-tar.sh "" $(VERSION)
get-orig-pom:
- wget --user-agent="" -O debian/pom-bnd.xml $(MAVEN_REPO)/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom
- wget --user-agent="" -O debian/pom-bndlib.xml $(MAVEN_REPO)/bndlib/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom
- wget --user-agent="" -O debian/pom-annotation.xml $(MAVEN_REPO)/annotation/$(MAVEN_VERSION)/annotation-$(MAVEN_VERSION).pom
+ wget --user-agent="" -O debian/pom-bnd.xml $(MAVEN_REPO)/bnd/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom
+ wget --user-agent="" -O debian/pom-bndlib.xml $(MAVEN_REPO)/bnd/bndlib/$(MAVEN_VERSION)/bndlib-$(MAVEN_VERSION).pom
+ wget --user-agent="" -O debian/pom-annotation.xml $(MAVEN_REPO)/bnd/annotation/$(MAVEN_VERSION)/annotation-$(MAVEN_VERSION).pom
.PHONY: bootstrap clean-bootstrap
--
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