[snappy-java] 15/51: Replace silk-weaver.jar by xml_grep from the xml-twig-tools package.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository snappy-java.

commit 9f0e5466b47614c328b57d39a927577c42e480e2
Author: Charles Plessy <plessy at debian.org>
Date:   Sat Nov 5 20:17:43 2011 +0900

    Replace silk-weaver.jar by xml_grep from the xml-twig-tools package.
---
 debian/control                                       |  4 ++--
 debian/patches/replace_silk-weaver_by_xml_grep.patch | 18 ++++++++++++++++++
 debian/patches/series                                |  1 +
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 61386e4..c12813f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Charles Plessy <plessy at debian.org>
-Build-Depends: debhelper (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libmaven-bundle-plugin-java 
+Build-Depends: debhelper (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.4), xml-twig-tools
+Build-Depends-Indep: libmaven-bundle-plugin-java
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-java/snappy-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/snappy-java.git
diff --git a/debian/patches/replace_silk-weaver_by_xml_grep.patch b/debian/patches/replace_silk-weaver_by_xml_grep.patch
new file mode 100644
index 0000000..2226097
--- /dev/null
+++ b/debian/patches/replace_silk-weaver_by_xml_grep.patch
@@ -0,0 +1,18 @@
+Description: Replace silk-weaver.jar by xml_grep from the xml-twig-tools package.
+ No sources are included for silk-weaver.jar, it is therefore deleted from the
+ Debian source package.
+Author: Charles Plessy <plessy at debian.org>
+Forwarded: why not ?
+diff --git a/Makefile b/Makefile
+index 7ad5cc6..2c65c55 100644
+--- a/Makefile
++++ b/Makefile
+@@ -62,7 +62,7 @@ NATIVE_DIR:=src/main/resources/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
+ NATIVE_TARGET_DIR:=$(TARGET)/classes/org/xerial/snappy/native/$(OS_NAME)/$(OS_ARCH)
+ NATIVE_DLL:=$(NATIVE_DIR)/$(LIBNAME)
+ 
+-snappy-jar-version:=snappy-java-$(shell $(JAVA) -jar lib/silk-weaver.jar find 'project(artifactId, version)' pom.xml | grep snappy-java | awk '{ print $$2; }')
++snappy-jar-version:=snappy-java-$(shell xml_grep --text_only "/project/version" pom.xml)
+ 
+ native: $(SNAPPY_UNPACKED) $(NATIVE_DLL) 
+ snappy: native $(TARGET)/$(snappy-jar-version).jar
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d60bab3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+replace_silk-weaver_by_xml_grep.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/snappy-java.git