[jruby] 01/01: Upload to unstable
Miguel Landaeta
nomadium at moszumanska.debian.org
Sun May 3 00:32:44 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository jruby.
commit 1c49da77a35468408585ff654c24876c29887245
Author: Miguel Landaeta <nomadium at debian.org>
Date: Sat May 2 18:46:51 2015 -0300
Upload to unstable
---
debian/changelog | 11 +++++++++
debian/control | 5 +++--
debian/maven.rules | 1 +
debian/patches/0003-do-not-install-gems.patch | 18 +++++++--------
.../patches/0004-replace-bundled-libraries.patch | 26 +++++++++++-----------
debian/patches/0012-nailgun.patch | 8 +++----
6 files changed, 41 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 92d2df7..5cca15c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+jruby (1.5.6-10) unstable; urgency=medium
+
+ * Add myself to Uploaders list.
+ * Replace dependency on libconstantine-java with libjnr-constants-java.
+ * Refresh patches:
+ - d/p/0003-do-not-install-gems.patch.
+ - d/p/0004-replace-bundled-libraries.patch.
+ - d/p/0012-nailgun.patch.
+
+ -- Miguel Landaeta <nomadium at debian.org> Sat, 02 May 2015 17:37:51 -0300
+
jruby (1.5.6-9) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 88a20a3..ea02077 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: ruby
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Sebastien Delafond <seb at debian.org>,
- Torsten Werner <twerner at debian.org>
+ Torsten Werner <twerner at debian.org>,
+ Miguel Landaeta <nomadium at debian.org>
Build-Depends: debhelper (>= 9~), openjdk-7-jdk (>= 7u71-2.5.3), ant-optional,
libasm3-java, libcommons-logging-java, libjarjar-java, libjoda-time-java,
- junit4, libbsf-java, libjline-java, bnd, libconstantine-java,
+ junit4, libbsf-java, libjline-java, bnd, libjnr-constants-java,
netbase, libjgrapht0.8-java, libjcodings-java, libbytelist-java, libjffi-java,
libjaffl-java, libjruby-joni-java, yydebug, nailgun, libjnr-posix-java,
libjnr-netdb-java, libyecht-java (>= 0.0.2-2~), cdbs, maven-repo-helper
diff --git a/debian/maven.rules b/debian/maven.rules
index afc07e7..99394bb 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1 +1,2 @@
asm * jar s/.*/3.x/ * *
+s/org\.jruby\.extras/com.github.jnr/ s/constantine/jnr-constants/ jar s/.*/debian/ * *
diff --git a/debian/patches/0003-do-not-install-gems.patch b/debian/patches/0003-do-not-install-gems.patch
index b46d24d..ea5f6ae 100644
--- a/debian/patches/0003-do-not-install-gems.patch
+++ b/debian/patches/0003-do-not-install-gems.patch
@@ -8,7 +8,7 @@ Subject: do not install gems
--- a/build.xml
+++ b/build.xml
-@@ -462,7 +462,6 @@
+@@ -452,7 +452,6 @@
<sysproperty key="jruby.home" value="${build.dir}/jar-complete/META-INF/jruby.home"/>
<env key="RUBYOPT" value=""/>
<jvmarg value="${run.jvm.model}"/>
@@ -16,7 +16,7 @@ Subject: do not install gems
<arg line="--no-ri --no-rdoc --ignore-dependencies --env-shebang"/>
</java>
-@@ -552,7 +551,6 @@
+@@ -542,7 +541,6 @@
<sysproperty key="jruby.home" value="${build.dir}/jar-complete/META-INF/jruby.home"/>
<env key="RUBYOPT" value=""/>
<jvmarg value="${run.jvm.model}"/>
@@ -24,7 +24,7 @@ Subject: do not install gems
<arg line="--no-ri --no-rdoc --ignore-dependencies --env-shebang"/>
</java>
-@@ -700,33 +698,8 @@
+@@ -690,33 +688,8 @@
</emma>
</target>
@@ -58,7 +58,7 @@ Subject: do not install gems
run-junit-interpreted-short,
test-rake-targets"
description="Runs unit tests.">
-@@ -734,7 +707,6 @@
+@@ -724,7 +697,6 @@
<target name="test-indy" depends="
copy-test-files,
@@ -66,7 +66,7 @@ Subject: do not install gems
run-junit-indy-short,
test-rake-targets"
description="Runs unit tests.">
-@@ -742,7 +714,6 @@
+@@ -732,7 +704,6 @@
<target name="test-extended" depends="
copy-test-files,
@@ -74,7 +74,7 @@ Subject: do not install gems
run-junit-compiled,
run-junit-embed,
test-rake-targets"
-@@ -1076,48 +1047,6 @@
+@@ -1066,48 +1037,6 @@
</sequential>
</macrodef>
@@ -123,7 +123,7 @@ Subject: do not install gems
<target name="update-excludes">
<java classname="org.jruby.Main" fork="true" maxmemory="${jruby.launch.memory}" failonerror="false" dir="${spec.dir}">
<classpath refid="jruby.execute.classpath"/>
-@@ -1299,7 +1228,6 @@
+@@ -1289,7 +1218,6 @@
<mkdir dir="${dist.stage.bin.dir}/lib/native"/>
<unzip-native-libs destination.dir="${dist.stage.bin.dir}/lib/native"/>
<fixEOLs dist-stage-dir="${dist.stage.bin.dir}"/>
@@ -131,7 +131,7 @@ Subject: do not install gems
<tar destfile="${dist.dir}/jruby-bin-${version.jruby}.tar.gz" compression="gzip">
<tarfileset dir="${dist.stage.bin.dir}" mode="755" prefix="jruby-${version.jruby}">
<include name="bin/**"/>
-@@ -1349,7 +1277,6 @@
+@@ -1339,7 +1267,6 @@
<patternset refid="dist.lib.files"/>
</fileset>
</copy>
@@ -139,7 +139,7 @@ Subject: do not install gems
<fixEOLs dist-stage-dir="${dist.stage.src.dir}"/>
<tar destfile="${dist.dir}/jruby-src-${version.jruby}.tar.gz" compression="gzip">
<tarfileset dir="${dist.stage.src.dir}" mode="755" prefix="jruby-${version.jruby}">
-@@ -1435,7 +1362,7 @@
+@@ -1425,7 +1352,7 @@
</antcall>
</target>
diff --git a/debian/patches/0004-replace-bundled-libraries.patch b/debian/patches/0004-replace-bundled-libraries.patch
index 9a79308..30ed287 100644
--- a/debian/patches/0004-replace-bundled-libraries.patch
+++ b/debian/patches/0004-replace-bundled-libraries.patch
@@ -27,7 +27,7 @@ Subject: replace bundled libraries
+ <include name="asm3-util.jar"/>
+ <include name="asm3-analysis.jar"/>
+ <include name="asm3-tree.jar"/>
-+ <include name="libconstantine-java.jar"/>
++ <include name="jnr-constants.jar"/>
+ <include name="joda-time.jar"/>
+ <include name="bsf.jar"/>
+ <include name="jline.jar"/>
@@ -38,7 +38,7 @@ Subject: replace bundled libraries
+ <include name="jaffl.jar"/>
+ <include name="jffi.jar"/>
+ <include name="joni.jar"/>
-+ <include name="nailgun.jar"/>
++ <include name="nailgun-server.jar"/>
+ <include name="yydebug.jar"/>
+ <include name="jnr-posix.jar"/>
+ <include name="jnr-netdb.jar"/>
@@ -47,7 +47,7 @@ Subject: replace bundled libraries
</path>
<path id="jruby.execute.classpath">
-@@ -299,38 +321,21 @@
+@@ -289,38 +311,21 @@
<jar destfile="${lib.dir}/jruby.jar" compress="true" index="true">
<fileset dir="${jruby.classes.dir}"/>
@@ -64,7 +64,7 @@ Subject: replace bundled libraries
<zipfileset src="${build.lib.dir}/bytelist.jar"/>
- <zipfileset src="${build.lib.dir}/constantine.jar"/>
- <zipfileset src="${build.lib.dir}/jline-0.9.93.jar"/>
-+ <zipfileset src="${build.lib.dir}/libconstantine-java.jar"/>
++ <zipfileset src="${build.lib.dir}/jnr-constants.jar"/>
+ <zipfileset src="${build.lib.dir}/jline.jar"/>
<zipfileset src="${build.lib.dir}/jcodings.jar"/>
<zipfileset src="${build.lib.dir}/joni.jar"/>
@@ -94,7 +94,7 @@ Subject: replace bundled libraries
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
<zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
<metainf dir="${base.dir}/spi">
-@@ -355,15 +360,15 @@
+@@ -345,15 +350,15 @@
<exclude name="org/jruby/ext/ffi/**/*"/>
<exclude name="org/jruby/embed/**/*"/>
</fileset>
@@ -104,7 +104,7 @@ Subject: replace bundled libraries
+ <zipfileset src="${build.lib.dir}/asm3-util.jar"/>
<zipfileset src="${build.lib.dir}/bytelist.jar"/>
- <zipfileset src="${build.lib.dir}/constantine.jar"/>
-+ <zipfileset src="${build.lib.dir}/libconstantine-java.jar"/>
++ <zipfileset src="${build.lib.dir}/jnr-constants.jar"/>
<zipfileset src="${build.lib.dir}/jcodings.jar"/>
<zipfileset src="${build.lib.dir}/joni.jar"/>
<zipfileset src="${build.lib.dir}/jnr-netdb.jar"/>
@@ -114,7 +114,7 @@ Subject: replace bundled libraries
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Main-Class" value="org.jruby.Main"/>
-@@ -377,38 +382,21 @@
+@@ -367,38 +372,21 @@
<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${build.lib.dir}/jarjar-1.0.jar"/>
<jarjar destfile="${lib.dir}/jruby.jar" compress="true">
<fileset dir="${jruby.classes.dir}"/>
@@ -129,7 +129,7 @@ Subject: replace bundled libraries
+ <zipfileset src="${build.lib.dir}/asm3-util.jar"/>
+ <zipfileset src="${build.lib.dir}/asm3-analysis.jar"/>
+ <zipfileset src="${build.lib.dir}/asm3-tree.jar"/>
-+ <zipfileset src="${build.lib.dir}/libconstantine-java.jar"/>
++ <zipfileset src="${build.lib.dir}/jnr-constants.jar"/>
<zipfileset src="${build.lib.dir}/bytelist.jar"/>
- <zipfileset src="${build.lib.dir}/jline-0.9.93.jar"/>
+ <zipfileset src="${build.lib.dir}/jline.jar"/>
@@ -161,7 +161,7 @@ Subject: replace bundled libraries
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
<zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
<metainf dir="${base.dir}/spi">
-@@ -472,41 +460,24 @@
+@@ -462,41 +450,24 @@
<exclude name="META-INF/jruby.home/lib/ruby/site_ruby/shared/builtin/**"/>
<exclude name="META-INF/jruby.home/lib/ruby/1.9/**"/>
</fileset>
@@ -178,7 +178,7 @@ Subject: replace bundled libraries
<zipfileset src="${build.lib.dir}/bytelist.jar"/>
- <zipfileset src="${build.lib.dir}/constantine.jar"/>
- <zipfileset src="${build.lib.dir}/jline-0.9.93.jar"/>
-+ <zipfileset src="${build.lib.dir}/libconstantine-java.jar"/>
++ <zipfileset src="${build.lib.dir}/jnr-constants.jar"/>
+ <zipfileset src="${build.lib.dir}/jline.jar"/>
<zipfileset src="${build.lib.dir}/jcodings.jar"/>
<zipfileset src="${build.lib.dir}/joni.jar"/>
@@ -212,7 +212,7 @@ Subject: replace bundled libraries
<metainf dir="${base.dir}/spi">
<include name="services/**"/>
</metainf>
-@@ -560,41 +531,24 @@
+@@ -550,41 +521,24 @@
<fileset dir="${build.dir}/jar-complete">
<exclude name="META-INF/jruby.home/lib/ruby/1.8/**"/>
</fileset>
@@ -229,7 +229,7 @@ Subject: replace bundled libraries
<zipfileset src="${build.lib.dir}/bytelist.jar"/>
- <zipfileset src="${build.lib.dir}/constantine.jar"/>
- <zipfileset src="${build.lib.dir}/jline-0.9.93.jar"/>
-+ <zipfileset src="${build.lib.dir}/libconstantine-java.jar"/>
++ <zipfileset src="${build.lib.dir}/jnr-constants.jar"/>
+ <zipfileset src="${build.lib.dir}/jline.jar"/>
<zipfileset src="${build.lib.dir}/jcodings.jar"/>
<zipfileset src="${build.lib.dir}/joni.jar"/>
@@ -263,7 +263,7 @@ Subject: replace bundled libraries
<metainf dir="${base.dir}/spi">
<include name="services/**"/>
</metainf>
-@@ -767,7 +721,7 @@
+@@ -757,7 +711,7 @@
<path id="test.class.path">
<pathelement path="${build.lib.dir}/junit.jar"/>
diff --git a/debian/patches/0012-nailgun.patch b/debian/patches/0012-nailgun.patch
index f51bebc..56b5d2c 100644
--- a/debian/patches/0012-nailgun.patch
+++ b/debian/patches/0012-nailgun.patch
@@ -13,7 +13,7 @@ Last-Update: 2013-11-01
<zipfileset src="${build.lib.dir}/joda-time.jar"/>
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-+ <zipfileset src="${build.lib.dir}/nailgun.jar"/>
++ <zipfileset src="${build.lib.dir}/nailgun-server.jar"/>
<metainf dir="${base.dir}/spi">
<include name="services/**"/>
</metainf>
@@ -22,7 +22,7 @@ Last-Update: 2013-11-01
<zipfileset src="${build.lib.dir}/joda-time.jar"/>
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-+ <zipfileset src="${build.lib.dir}/nailgun.jar"/>
++ <zipfileset src="${build.lib.dir}/nailgun-server.jar"/>
<metainf dir="${base.dir}/spi">
<include name="services/**"/>
</metainf>
@@ -31,7 +31,7 @@ Last-Update: 2013-11-01
<zipfileset src="${build.lib.dir}/joda-time.jar"/>
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-+ <zipfileset src="${build.lib.dir}/nailgun.jar"/>
++ <zipfileset src="${build.lib.dir}/nailgun-server.jar"/>
<zipfileset src="${local.shared.lib.dir}/yecht.jar"/>
<metainf dir="${base.dir}/spi">
<include name="services/**"/>
@@ -40,7 +40,7 @@ Last-Update: 2013-11-01
<zipfileset src="${build.lib.dir}/joda-time.jar"/>
<zipfileset src="${build.lib.dir}/yydebug.jar"/>
- <zipfileset src="${build.lib.dir}/nailgun-0.7.1.jar"/>
-+ <zipfileset src="${build.lib.dir}/nailgun.jar"/>
++ <zipfileset src="${build.lib.dir}/nailgun-server.jar"/>
<zipfileset src="${local.shared.lib.dir}/yecht.jar"/>
<metainf dir="${base.dir}/spi">
<include name="services/**"/>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git
More information about the pkg-java-commits
mailing list