matthiasblaesing closed pull request #517: [NETBEANS-718] Added Debian/Ubuntu
library folders for Subversion Native binding searchlist.
URL: https://github.com/apache/incubator-netbeans/pull/517
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/libs.svnClientAdapter.javahl/src/org/netbeans/libs/svnclientadapter/javahl/JavaHlClientAdapterFactory.java
b/libs.svnClientAdapter.javahl/src/org/netbeans/libs/svnclientadapter/javahl/JavaHlClientAdapterFactory.java
index 95a2b3c96..d358467cd 100644
---
a/libs.svnClientAdapter.javahl/src/org/netbeans/libs/svnclientadapter/javahl/JavaHlClientAdapterFactory.java
+++
b/libs.svnClientAdapter.javahl/src/org/netbeans/libs/svnclientadapter/javahl/JavaHlClientAdapterFactory.java
@@ -163,7 +163,8 @@ private void presetJavahlUnix() {
}
String name = "libsvnjavahl-1.so";
String[] locations = new String[] {"/usr/lib/", "/usr/lib/jni/",
"/usr/local/lib/",
- "/usr/lib64/", "/usr/lib64/jni/", "/usr/local/lib64/",
"/opt/csw/bin/svn/"};
+ "/usr/lib64/", "/usr/lib64/jni/", "/usr/local/lib64/",
"/opt/csw/bin/svn/",
+ "/usr/lib/x86_64-linux-gnu/jni/", "/usr/lib/i386-linux-gnu/jni/"};
File location = null;
for (String loc : locations) {
File file = new File(loc, name);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@netbeans.apache.org
For additional commands, e-mail: notifications-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
