This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository bnd.
commit ddeb0763de2df6877fe24b5ad60c705ed7c683d7
Author: 殷啟聰 | Kai-Chung Yan <seamli...@gmail.com>
Date: Sat Mar 10 15:17:29 2018 +0800
Point $HOME to `debian`, thus fixing the URL cache bug without patching it
---
debian/bnd.poms | 32 ++++++++++++++--------------
debian/patches/relocate-data-directory.patch | 19 -----------------
debian/patches/series | 1 -
debian/rules | 4 ++--
4 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/debian/bnd.poms b/debian/bnd.poms
index 4cf8077..e7a2a1a 100644
--- a/debian/bnd.poms
+++ b/debian/bnd.poms
@@ -1,16 +1,16 @@
-debian/.m2/biz/aQute/bnd/aQute.libg/3.5.0/aQute.libg-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/aQute.libg/3.5.0/aQute.libg-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.bnd.annotation/3.5.0/biz.aQute.bnd.annotation-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.bnd.annotation/3.5.0/biz.aQute.bnd.annotation-3.5.0.jar
--relocate=biz.aQute:annotation:debian,biz.aQute.bnd:annotation:debian
-debian/.m2/biz/aQute/bnd/biz.aQute.bnd/3.5.0/biz.aQute.bnd-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.bnd/3.5.0/biz.aQute.bnd-3.5.0.jar
--relocate=biz.aQute:bnd:debian,biz.aQute.bnd:bnd:debian
-debian/.m2/biz/aQute/bnd/biz.aQute.bndlib/3.5.0/biz.aQute.bndlib-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.bndlib/3.5.0/biz.aQute.bndlib-3.5.0.jar
--relocate=biz.aQute:bndlib:debian,biz.aQute.bnd:bndlib:debian
-debian/.m2/biz/aQute/bnd/biz.aQute.junit/3.5.0/biz.aQute.junit-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.junit/3.5.0/biz.aQute.junit-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.launcher/3.5.0/biz.aQute.launcher-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.launcher/3.5.0/biz.aQute.launcher-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.remote.agent/3.5.0/biz.aQute.remote.agent-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.agent/3.5.0/biz.aQute.remote.agent-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.remote.api/3.5.0/biz.aQute.remote.api-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.api/3.5.0/biz.aQute.remote.api-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.remote.gc/3.5.0/biz.aQute.remote.gc-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.gc/3.5.0/biz.aQute.remote.gc-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.remote.launcher/3.5.0/biz.aQute.remote.launcher-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.launcher/3.5.0/biz.aQute.remote.launcher-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.remote.main/3.5.0/biz.aQute.remote.main-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.remote.main/3.5.0/biz.aQute.remote.main-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.repository/3.5.0/biz.aQute.repository-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.repository/3.5.0/biz.aQute.repository-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.resolve/3.5.0/biz.aQute.resolve-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.resolve/3.5.0/biz.aQute.resolve-3.5.0.jar
-debian/.m2/biz/aQute/bnd/biz.aQute.tester/3.5.0/biz.aQute.tester-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/biz.aQute.tester/3.5.0/biz.aQute.tester-3.5.0.jar
-debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.api/3.5.0/org.osgi.impl.bundle.repoindex.api-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.api/3.5.0/org.osgi.impl.bundle.repoindex.api-3.5.0.jar
-debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.lib/3.5.0/org.osgi.impl.bundle.repoindex.lib-3.5.0.pom
--java-lib
--artifact=debian/.m2/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.lib/3.5.0/org.osgi.impl.bundle.repoindex.lib-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/aQute.libg/3.5.0/aQute.libg-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/aQute.libg/3.5.0/aQute.libg-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd.annotation/3.5.0/biz.aQute.bnd.annotation-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd.annotation/3.5.0/biz.aQute.bnd.annotation-3.5.0.jar
--relocate=biz.aQute:annotation:debian,biz.aQute.bnd:annotation:debian
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd/3.5.0/biz.aQute.bnd-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.bnd/3.5.0/biz.aQute.bnd-3.5.0.jar
--relocate=biz.aQute:bnd:debian,biz.aQute.bnd:bnd:debian
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.bndlib/3.5.0/biz.aQute.bndlib-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.bndlib/3.5.0/biz.aQute.bndlib-3.5.0.jar
--relocate=biz.aQute:bndlib:debian,biz.aQute.bnd:bndlib:debian
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.junit/3.5.0/biz.aQute.junit-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.junit/3.5.0/biz.aQute.junit-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.launcher/3.5.0/biz.aQute.launcher-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.launcher/3.5.0/biz.aQute.launcher-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.agent/3.5.0/biz.aQute.remote.agent-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.agent/3.5.0/biz.aQute.remote.agent-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.api/3.5.0/biz.aQute.remote.api-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.api/3.5.0/biz.aQute.remote.api-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.gc/3.5.0/biz.aQute.remote.gc-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.gc/3.5.0/biz.aQute.remote.gc-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.launcher/3.5.0/biz.aQute.remote.launcher-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.launcher/3.5.0/biz.aQute.remote.launcher-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.main/3.5.0/biz.aQute.remote.main-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.remote.main/3.5.0/biz.aQute.remote.main-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.repository/3.5.0/biz.aQute.repository-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.repository/3.5.0/biz.aQute.repository-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.resolve/3.5.0/biz.aQute.resolve-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.resolve/3.5.0/biz.aQute.resolve-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/biz.aQute.tester/3.5.0/biz.aQute.tester-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/biz.aQute.tester/3.5.0/biz.aQute.tester-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.api/3.5.0/org.osgi.impl.bundle.repoindex.api-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.api/3.5.0/org.osgi.impl.bundle.repoindex.api-3.5.0.jar
+debian/.m2/repository/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.lib/3.5.0/org.osgi.impl.bundle.repoindex.lib-3.5.0.pom
--java-lib
--artifact=debian/.m2/repository/biz/aQute/bnd/org.osgi.impl.bundle.repoindex.lib/3.5.0/org.osgi.impl.bundle.repoindex.lib-3.5.0.jar
diff --git a/debian/patches/relocate-data-directory.patch
b/debian/patches/relocate-data-directory.patch
deleted file mode 100644
index 00f8355..0000000
--- a/debian/patches/relocate-data-directory.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Relocate Data Directory
- "bnd" hardcodes its data directory to "~/.bnd" which causes problems when
building in pbuilder.
- Fakeroot makes the program think it is root but actually it has no permission
to create such
- directory under "/root". This workaround relocates parts of the data
directory to "/tmp/.bnd".
-Author: Kai-Chung Yan (殷啟聰) <seamli...@gmail.com>
-Bug: https://github.com/bndtools/bnd/issues/2327
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/biz.aQute.bndlib/src/aQute/bnd/http/HttpClient.java
-+++ b/biz.aQute.bndlib/src/aQute/bnd/http/HttpClient.java
-@@ -82,7 +82,7 @@
- private ThreadLocal<PasswordAuthentication> passwordAuthentication
= new ThreadLocal<>();
- private boolean
inited;
- private static JSONCodec codec
= new JSONCodec();
-- private URLCache
cache = new
URLCache(IO.getFile("~/.bnd/urlcache"));
-+ private URLCache
cache = new
URLCache(IO.getFile("/tmp/.bnd/urlcache"));
- private Registry
registry = null;
- private Reporter
reporter;
- private volatile AtomicBoolean offline;
diff --git a/debian/patches/series b/debian/patches/series
index ca29c16..60deb51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ use-bootstrapped-gradle-plugin.patch
reproducible-timestamps.patch
reproducible-packages-list.patch
build-scripts.patch
-relocate-data-directory.patch
diff --git a/debian/rules b/debian/rules
index 27ee437..206e20d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
include /usr/share/dpkg/pkg-info.mk
PACKAGE := bnd
export JAVA_HOME = /usr/lib/jvm/default-java
+export HOME = debian
%:
dh $@ --buildsystem=gradle --with maven-repo-helper
@@ -55,8 +56,7 @@ override_dh_auto_build:
:biz.aQute.junit:assemble \
:org.osgi.impl.bundle.repoindex.lib:assemble \
:biz.aQute.bnd.gradle:assemble \
- -x :demo:compileJava -x :demo:jar -x :cnf:jar \
- --system-prop maven.repo.local=debian/.m2
+ -x :demo:compileJava -x :demo:jar -x :cnf:jar
pod2man -c 'BND for Debian GNU/Linux' \
-r $(PACKAGE)-$(DEB_VERSION_UPSTREAM) \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/bnd.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
