[libnative-platform-java] 10/12: Revert "Drop PosixFile_rename.patch and remove additionalSrc/PosixFile.java."
Markus Koschany
apo at moszumanska.debian.org
Thu Nov 23 18:14:05 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository libnative-platform-java.
commit 7f29fadda7073ebf344ebb30f63de646bb1df1a7
Author: Markus Koschany <apo at debian.org>
Date: Thu Nov 23 18:48:33 2017 +0100
Revert "Drop PosixFile_rename.patch and remove additionalSrc/PosixFile.java."
This reverts commit 2f7ed44d8bd76ec41a797bdded3a64353289badc.
---
debian/additionalSrc/PosixFile.java | 20 ++++++++++++++++++++
debian/patches/PosixFile_rename.patch | 17 +++++++++++++++++
debian/patches/series | 1 +
3 files changed, 38 insertions(+)
diff --git a/debian/additionalSrc/PosixFile.java b/debian/additionalSrc/PosixFile.java
new file mode 100644
index 0000000..4e81b5a
--- /dev/null
+++ b/debian/additionalSrc/PosixFile.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2016 Kai-Chung Yan (殷啟聰)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.rubygrapefruit.platform;
+
+ at ThreadSafe
+public interface PosixFile extends PosixFileInfo {}
\ No newline at end of file
diff --git a/debian/patches/PosixFile_rename.patch b/debian/patches/PosixFile_rename.patch
new file mode 100644
index 0000000..e173895
--- /dev/null
+++ b/debian/patches/PosixFile_rename.patch
@@ -0,0 +1,17 @@
+Description: native-helper 0.11 suddenly renamed PosixFile
+ This patch fixes the problem by reintroducing PosixFile and should be safe to
+ remove after Gradle is updated to 3.1.
+ See https://github.com/adammurdoch/native-platform/commit/bceb8b65fa12113551056d2ba7903345ae3247cb
+Author: Kai-Chung Yan (殷啟聰)
+Last-Update: 2016-10-27
+--- a/build.gradle
++++ b/build.gradle
+@@ -208,3 +208,7 @@
+ dep.appendNode('version', project.version)
+ }
+ }
++
++sourceSets.main.java { srcDir 'debian/additionalSrc' }
++compileJava.options.encoding = 'UTF-8'
++javadoc.options.encoding = 'UTF-8'
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index b9722fa..4685e2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
native_locator_usr_lib_first.patch
libname.diff
+PosixFile_rename.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnative-platform-java.git
More information about the pkg-java-commits
mailing list