[jruby] 02/06: Refresh patches
Miguel Landaeta
nomadium at moszumanska.debian.org
Sat Mar 11 17:17:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch experimental
in repository jruby.
commit 6f66a9addd4b5c94fa2d1b3893468f699f619a62
Author: Miguel Landaeta <nomadium at debian.org>
Date: Sat Mar 11 12:17:51 2017 +0000
Refresh patches
---
debian/changelog | 8 +++
...-Disable-unpackaged-plugins-in-lib-module.patch | 6 +--
debian/patches/0003-Disable-truffle-module.patch | 59 ----------------------
...004-Add-missing-maven-artifacts-pom-files.patch | 22 ++++----
.../0005-Disable-jnr-ffi-native-usage.patch | 14 ++---
...Add-usr-lib-ruby-vendor-ruby-to-load-path.patch | 8 +--
debian/patches/series | 1 -
7 files changed, 33 insertions(+), 85 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c874bd8..32e1ac2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jruby (9.1.8.0-1~exp1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ * Refresh patches.
+ Drop patch 0003-Disable-truffle-module.patch since is no longer needed.
+
+ -- Miguel Landaeta <nomadium at debian.org> Sat, 11 Mar 2017 12:17:07 +0000
+
jruby (9.1.6.0-1~exp3) experimental; urgency=medium
* Add versioned dependency on jruby-openssl (>= 0.9.17~).
diff --git a/debian/patches/0002-Disable-unpackaged-plugins-in-lib-module.patch b/debian/patches/0002-Disable-unpackaged-plugins-in-lib-module.patch
index bc10133..d60cdaa 100644
--- a/debian/patches/0002-Disable-unpackaged-plugins-in-lib-module.patch
+++ b/debian/patches/0002-Disable-unpackaged-plugins-in-lib-module.patch
@@ -1,11 +1,11 @@
Description: Disable references to unpackaged maven plugins in lib module
Author: Miguel Landaeta <nomadium at debian.org>
Forwarded: no
-Last-Update: 2017-02-01
+Last-Update: 2017-03-08
--- a/lib/pom.xml
+++ b/lib/pom.xml
-@@ -310,6 +310,7 @@ DO NOT MODIFIY - GENERATED CODE
+@@ -309,6 +309,7 @@ DO NOT MODIFIY - GENERATED CODE
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
</plugin>
@@ -13,7 +13,7 @@ Last-Update: 2017-02-01
<plugin>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-maven-plugin</artifactId>
-@@ -368,6 +369,7 @@ DO NOT MODIFIY - GENERATED CODE
+@@ -367,6 +368,7 @@ DO NOT MODIFIY - GENERATED CODE
</dependency>
</dependencies>
</plugin>
diff --git a/debian/patches/0003-Disable-truffle-module.patch b/debian/patches/0003-Disable-truffle-module.patch
deleted file mode 100644
index 3417c58..0000000
--- a/debian/patches/0003-Disable-truffle-module.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Disable truffle module build
-Author: Miguel Landaeta <nomadium at debian.org>
-Forwarded: no
-Last-Update: 2017-01-21
-
---- jruby-9.1.6.0.orig/pom.xml
-+++ jruby-9.1.6.0/pom.xml
-@@ -528,6 +528,7 @@ DO NOT MODIFIY - GENERATED CODE
- </plugins>
- </reporting>
- <profiles>
-+ <!-- truffle is disable because it will be packaged in a different package
- <profile>
- <id>truffle</id>
- <activation>
-@@ -537,6 +538,7 @@ DO NOT MODIFIY - GENERATED CODE
- <module>truffle</module>
- </modules>
- </profile>
-+ -->
- <profile>
- <id>test</id>
- <modules>
-@@ -727,7 +729,7 @@ DO NOT MODIFIY - GENERATED CODE
- <defaultGoal>install</defaultGoal>
- </build>
- <modules>
-- <module>truffle</module>
-+ <!--<module>truffle</module>-->
- <module>test</module>
- <module>maven</module>
- </modules>
-@@ -738,7 +740,7 @@ DO NOT MODIFIY - GENERATED CODE
- <defaultGoal>clean</defaultGoal>
- </build>
- <modules>
-- <module>truffle</module>
-+ <!--<module>truffle</module>-->
- <module>test</module>
- <module>maven</module>
- </modules>
-@@ -746,7 +748,7 @@ DO NOT MODIFIY - GENERATED CODE
- <profile>
- <id>release</id>
- <modules>
-- <module>truffle</module>
-+ <!--<module>truffle</module>-->
- <module>test</module>
- <module>maven</module>
- </modules>
-@@ -784,7 +786,7 @@ DO NOT MODIFIY - GENERATED CODE
- </plugins>
- </build>
- <modules>
-- <module>truffle</module>
-+ <!--<module>truffle</module>-->
- <module>maven</module>
- </modules>
- <distributionManagement>
diff --git a/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
index b48a68f..192b0e6 100644
--- a/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
+++ b/debian/patches/0004-Add-missing-maven-artifacts-pom-files.patch
@@ -5,10 +5,10 @@ Description: Add missing POM files for maven artifacts
need to add them manually to the source
Author: Miguel Landaeta <nomadium at debian.org>
Forwarded: no
-Last-Update: 2017-02-07
+Last-Update: 2017-03-08
--- /dev/null
-+++ jruby-9.1.6.0/maven/pom.xml
++++ jruby-9.1.8.0/maven/pom.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
@@ -24,7 +24,7 @@ Last-Update: 2017-02-07
+ <parent>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-parent</artifactId>
-+ <version>9.1.6.0</version>
++ <version>9.1.8.0</version>
+ </parent>
+ <artifactId>jruby-artifacts</artifactId>
+ <packaging>pom</packaging>
@@ -145,7 +145,7 @@ Last-Update: 2017-02-07
+</project>
--- /dev/null
-+++ jruby-9.1.6.0/maven/jruby-dist/pom.xml
++++ jruby-9.1.8.0/maven/jruby-dist/pom.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
@@ -161,7 +161,7 @@ Last-Update: 2017-02-07
+ <parent>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-artifacts</artifactId>
-+ <version>9.1.6.0</version>
++ <version>9.1.8.0</version>
+ </parent>
+ <artifactId>jruby-dist</artifactId>
+ <packaging>pom</packaging>
@@ -359,7 +359,7 @@ Last-Update: 2017-02-07
+</project>
--- /dev/null
-+++ jruby-9.1.6.0/maven/jruby-complete/pom.xml
++++ jruby-9.1.8.0/maven/jruby-complete/pom.xml
@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
@@ -375,7 +375,7 @@ Last-Update: 2017-02-07
+ <parent>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-artifacts</artifactId>
-+ <version>9.1.6.0</version>
++ <version>9.1.8.0</version>
+ </parent>
+ <artifactId>jruby-complete</artifactId>
+ <packaging>bundle</packaging>
@@ -676,7 +676,7 @@ Last-Update: 2017-02-07
+</project>
--- /dev/null
-+++ jruby-9.1.6.0/maven/jruby/pom.xml
++++ jruby-9.1.8.0/maven/jruby/pom.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
@@ -692,7 +692,7 @@ Last-Update: 2017-02-07
+ <parent>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-artifacts</artifactId>
-+ <version>9.1.6.0</version>
++ <version>9.1.8.0</version>
+ </parent>
+ <artifactId>jruby</artifactId>
+ <name>JRuby Main Maven Artifact</name>
@@ -906,7 +906,7 @@ Last-Update: 2017-02-07
+</project>
--- /dev/null
-+++ jruby-9.1.6.0/test/pom.xml
++++ jruby-9.1.8.0/test/pom.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
@@ -922,7 +922,7 @@ Last-Update: 2017-02-07
+ <parent>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-parent</artifactId>
-+ <version>9.1.6.0</version>
++ <version>9.1.8.0</version>
+ </parent>
+ <artifactId>jruby-tests</artifactId>
+ <name>JRuby Integration Tests</name>
diff --git a/debian/patches/0005-Disable-jnr-ffi-native-usage.patch b/debian/patches/0005-Disable-jnr-ffi-native-usage.patch
index 5f4a807..ecb68b9 100644
--- a/debian/patches/0005-Disable-jnr-ffi-native-usage.patch
+++ b/debian/patches/0005-Disable-jnr-ffi-native-usage.patch
@@ -2,11 +2,11 @@ Description: Disable jnr-ffi native usage
There is not a jnr-ffi native jar in Debian
Author: Miguel Landaeta <nomadium at debian.org>
Forwarded: no
-Last-Update: 2017-02-01
+Last-Update: 2017-03-03
---- jruby-9.1.6.0.orig/core/pom.xml
-+++ jruby-9.1.6.0/core/pom.xml
-@@ -638,6 +638,7 @@ DO NOT MODIFIY - GENERATED CODE
+--- jruby-9.1.7.0.orig/core/pom.xml
++++ jruby-9.1.7.0/core/pom.xml
+@@ -625,6 +625,7 @@ DO NOT MODIFIY - GENERATED CODE
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -14,7 +14,7 @@ Last-Update: 2017-02-01
<execution>
<id>unzip native</id>
<phase>clean</phase>
-@@ -659,6 +660,7 @@ DO NOT MODIFIY - GENERATED CODE
+@@ -646,6 +647,7 @@ DO NOT MODIFIY - GENERATED CODE
</artifactItems>
</configuration>
</execution>
@@ -22,7 +22,7 @@ Last-Update: 2017-02-01
</executions>
</plugin>
</plugins>
-@@ -1044,6 +1046,7 @@ DO NOT MODIFIY - GENERATED CODE
+@@ -1031,6 +1033,7 @@ DO NOT MODIFIY - GENERATED CODE
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
@@ -30,7 +30,7 @@ Last-Update: 2017-02-01
<execution>
<phase>process-classes</phase>
<goals>
-@@ -1064,6 +1067,7 @@ DO NOT MODIFIY - GENERATED CODE
+@@ -1051,6 +1054,7 @@ DO NOT MODIFIY - GENERATED CODE
</artifactItems>
</configuration>
</execution>
diff --git a/debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch b/debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
index f08e462..a787282 100644
--- a/debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
+++ b/debian/patches/0007-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
@@ -2,7 +2,7 @@ Description: Add /usr/lib/ruby/vendor_ruby to default LOAD_PATH
Author: Miguel Landaeta <nomadium at debian.org>
Bug-Debian: https://bugs.debian.org/663342
Forwarded: no
-Last-Update: 2017-02-10
+Last-Update: 2017-03-08
--- a/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
+++ b/core/src/main/java/org/jruby/ext/rbconfig/RbConfigLibrary.java
@@ -45,7 +45,7 @@ Last-Update: 2017-02-10
--- a/core/src/main/java/org/jruby/runtime/load/LoadService.java
+++ b/core/src/main/java/org/jruby/runtime/load/LoadService.java
-@@ -70,6 +70,7 @@ import org.jruby.runtime.Helpers;
+@@ -71,6 +71,7 @@ import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.util.FileResource;
import org.jruby.util.JRubyFile;
@@ -53,7 +53,7 @@ Last-Update: 2017-02-10
import org.jruby.util.collections.StringArraySet;
import org.jruby.util.log.Logger;
import org.jruby.util.log.LoggerFactory;
-@@ -251,6 +252,11 @@ public class LoadService {
+@@ -253,6 +254,11 @@ public class LoadService {
addPath(RbConfigLibrary.getRubyLibDir(runtime));
}
@@ -68,7 +68,7 @@ Last-Update: 2017-02-10
--- a/bin/jruby.bash
+++ b/bin/jruby.bash
-@@ -413,6 +413,7 @@
+@@ -402,6 +402,7 @@ else
"-Djruby.home=$JRUBY_HOME" \
"-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
"-Djruby.shell=$JRUBY_SHELL" \
diff --git a/debian/patches/series b/debian/patches/series
index 8df7404..f8f2175 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
0001-Disable-polyglot-maven-extension.patch
0002-Disable-unpackaged-plugins-in-lib-module.patch
-0003-Disable-truffle-module.patch
0004-Add-missing-maven-artifacts-pom-files.patch
0005-Disable-jnr-ffi-native-usage.patch
0006-Disable-maven-jruby-jars-artifact.patch
--
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