[Git][java-team/openrefine][master] 13 commits: Add an appstream file and rename the desktop file
Markus Koschany (@apo)
gitlab at salsa.debian.org
Sun Oct 17 20:38:46 BST 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / openrefine
Commits:
ecfa5b0b by Markus Koschany at 2021-10-17T16:41:35+02:00
Add an appstream file and rename the desktop file
- - - - -
03dcb6f8 by Markus Koschany at 2021-10-17T16:59:02+02:00
test
- - - - -
12c3b669 by Markus Koschany at 2021-10-17T17:01:07+02:00
Drop jdatapath.patch
- - - - -
2ded1f1f by Markus Koschany at 2021-10-17T17:02:19+02:00
Update google-http-client-jackson2.patch
- - - - -
bea8b1cc by Markus Koschany at 2021-10-17T17:08:15+02:00
New upstream version 3.5~git20211016
- - - - -
172f6fca by Markus Koschany at 2021-10-17T17:08:27+02:00
Update upstream source from tag 'upstream/3.5_git20211016'
Update to upstream version '3.5~git20211016'
with Debian dir 37c56679e1b85685c63e20596417840b4e3b5682
- - - - -
ef5a3b9e by Markus Koschany at 2021-10-17T17:08:57+02:00
Update changelog
- - - - -
8230e71e by Markus Koschany at 2021-10-17T18:24:51+02:00
Link system libraries to extensions
- - - - -
b7e1e3f7 by Markus Koschany at 2021-10-17T18:26:43+02:00
Fix openrefine.install
- - - - -
eb6fafc9 by Markus Koschany at 2021-10-17T17:00:09+00:00
Pass parameters to refine script
- - - - -
4d45a837 by Markus Koschany at 2021-10-17T19:02:47+02:00
Update openrefine-bin.patch
- - - - -
71e9d1b6 by Markus Koschany at 2021-10-17T19:17:04+02:00
Add butterfly.properties.patch
- - - - -
d8d86896 by Markus Koschany at 2021-10-17T21:38:29+02:00
Don't install unncessary files.
- - - - -
13 changed files:
- debian/bin/openrefine
- debian/changelog
- debian/openrefine.install
- + debian/openrefine.metainfo.xml
- debian/openrefine.desktop → debian/org.openrefine.openrefine.desktop
- debian/patches/build.patch
- + debian/patches/butterfly.properties.patch
- debian/patches/google-http-client-jackson2.patch
- − debian/patches/jdatapath.patch
- debian/patches/no-java-files.patch
- debian/patches/openrefine-bin.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/bin/openrefine
=====================================
@@ -3,4 +3,4 @@
set -e
cd /usr/share/openrefine
-./refine
+./refine "$@"
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+openrefine (3.5~git20211016-1) UNRELEASED; urgency=medium
+
+ *
+
+ -- Markus Koschany <apo at debian.org> Sun, 17 Oct 2021 17:08:45 +0200
+
openrefine (3.5~git20210527-1) experimental; urgency=medium
* Initial release. (Closes: #986604 )
=====================================
debian/openrefine.install
=====================================
@@ -1,9 +1,11 @@
debian/bin/openrefine usr/bin
debian/git.properties usr/share/openrefine/webapp/WEB-INF/classes
-debian/openrefine.desktop usr/share/applications
+debian/org.openrefine.openrefine.desktop usr/share/applications
+debian/openrefine.metainfo.xml usr/share/metainfo
debian/openrefine.png usr/share/icons/hicolor/128x128/apps
main/webapp/WEB-INF/* usr/share/openrefine/webapp/WEB-INF/
main/webapp/modules usr/share/openrefine/webapp/
+extensions usr/share/openrefine/webapp/
refine usr/share/openrefine/
refine.ini etc/openrefine/
-server/target/openrefine-3.5-SNAPSHOT-server.jar usr/share/openrefine/server/
+server/target/openrefine-3.6-SNAPSHOT-server.jar usr/share/openrefine/server/
=====================================
debian/openrefine.metainfo.xml
=====================================
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2021 Markus Koschany <apo at debian.org> -->
+<component type="desktop-application">
+ <id>org.openrefine.openrefine</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>BSD-3-clause</project_license>
+ <name>OpenRefine</name>
+ <summary>powerful tool for working with messy data</summary>
+
+ <description>
+ <p>
+ OpenRefine is a power tool for working with messy data. Use it to
+ improve data consistency, link it to data registries like Wikidata,
+ augment it with data from other sources, transform it into different
+ formats for other tools to consume, and contribute it back to the
+ original sources. OpenRefine is not a web service but a desktop app
+ that runs on your own computer,so you can process sensitive data with
+ privacy.
+ </p>
+ </description>
+
+ <launchable type="desktop-id">org.openrefine.openrefine.desktop</launchable>
+
+ <screenshots>
+ <screenshot type="default">
+ <caption>The options dialog</caption>
+ <image>http://www.hughsie.com/en_US/main.png</image>
+ </screenshot>
+ <screenshot>
+ <image>http://www.hughsie.com/en_US/preferences.png</image>
+ </screenshot>
+ </screenshots>
+
+ <url type="homepage">https://openrefine.org/</url>
+
+ <provides>
+ <binary>openrefine</binary>
+ </provides>
+
+</component>
+
+
=====================================
debian/openrefine.desktop → debian/org.openrefine.openrefine.desktop
=====================================
=====================================
debian/patches/build.patch
=====================================
@@ -8,7 +8,7 @@ Is this really needed?
1 file changed, 4 insertions(+)
diff --git a/main/pom.xml b/main/pom.xml
-index 8f79a29..3f4de9e 100644
+index 93a3c42..e7b9d08 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -310,6 +310,10 @@
=====================================
debian/patches/butterfly.properties.patch
=====================================
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 17 Oct 2021 19:15:32 +0200
+Subject: butterfly.properties
+
+Set the correct path to the extensions.
+---
+ main/webapp/WEB-INF/butterfly.properties | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/main/webapp/WEB-INF/butterfly.properties b/main/webapp/WEB-INF/butterfly.properties
+index e16262b..67be507 100644
+--- a/main/webapp/WEB-INF/butterfly.properties
++++ b/main/webapp/WEB-INF/butterfly.properties
+@@ -24,7 +24,7 @@ butterfly.default.mountpoint = /extension
+ # ---------- Module ------
+
+ butterfly.modules.path = modules
+-butterfly.modules.path = ../../extensions
++butterfly.modules.path = extensions
+ # Add more paths here if your extensions live elsewhere.
+ # Relative paths are relative to refine/main/webapp/
+
=====================================
debian/patches/google-http-client-jackson2.patch
=====================================
@@ -1,5 +1,5 @@
From: Markus Koschany <apo at debian.org>
-Date: Mon, 11 Oct 2021 13:36:19 +0200
+Date: Sat, 16 Oct 2021 14:10:43 +0200
Subject: google-http-client-jackson2
---
@@ -7,12 +7,12 @@ Subject: google-http-client-jackson2
1 file changed, 10 insertions(+)
diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml
-index 49dff2c..2ae80d6 100644
+index 718fbf6..87706b6 100644
--- a/extensions/gdata/pom.xml
+++ b/extensions/gdata/pom.xml
-@@ -136,6 +136,16 @@
- <artifactId>google-api-services-sheets</artifactId>
- <version>v4-rev20200922-1.30.10</version>
+@@ -131,6 +131,16 @@
+ <artifactId>google-api-services-drive</artifactId>
+ <version>v3-rev20210315-1.31.0</version>
</dependency>
+ <dependency>
+ <groupId>com.google.http-client</groupId>
@@ -25,5 +25,5 @@ index 49dff2c..2ae80d6 100644
+ <version>1.40.1</version>
+ </dependency>
<dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
+ <groupId>com.google.apis</groupId>
+ <artifactId>google-api-services-sheets</artifactId>
=====================================
debian/patches/jdatapath.patch deleted
=====================================
@@ -1,78 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 2 May 2021 23:42:07 +0200
-Subject: jdatapath
-
-Remove dependency on jdatapath.
----
- server/src/com/google/refine/Refine.java | 51 +-------------------------------
- 1 file changed, 1 insertion(+), 50 deletions(-)
-
-diff --git a/server/src/com/google/refine/Refine.java b/server/src/com/google/refine/Refine.java
-index 0a52405..7e690ca 100644
---- a/server/src/com/google/refine/Refine.java
-+++ b/server/src/com/google/refine/Refine.java
-@@ -64,9 +64,6 @@ import com.google.util.threads.ThreadPoolExecutorAdapter;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-
--import com.codeberry.jdatapath.DataPath;
--import com.codeberry.jdatapath.JDataPathSystem;
--
- import com.google.refine.Configurations;
-
- /**
-@@ -355,53 +352,7 @@ class RefineServer extends Server {
- File gridworksDir = null;
-
- String os = System.getProperty("os.name").toLowerCase();
-- if (os.contains("windows")) {
-- try {
-- // NOTE(SM): finding the "local data app" in windows from java is actually a PITA
-- // see http://stackoverflow.com/questions/1198911/how-to-get-local-application-data-folder-in-java
-- // so we're using a library that uses JNI to ask directly the win32 APIs,
-- // it's not elegant but it's the safest bet.
--
-- dataDir = new File(fixWindowsUnicodePath(JDataPathSystem.getLocalSystem()
-- .getLocalDataPath("OpenRefine").getPath()));
--
-- DataPath localDataPath = JDataPathSystem.getLocalSystem().getLocalDataPath("Google");
--
-- // new: ./Google/Refine old: ./Gridworks
-- grefineDir = new File(new File(fixWindowsUnicodePath(localDataPath.getPath())), "Refine");
-- gridworksDir = new File(fixWindowsUnicodePath(JDataPathSystem.getLocalSystem()
-- .getLocalDataPath("Gridworks").getPath()));
-- } catch (Error e) {
-- /*
-- * The above trick can fail, particularly on a 64-bit OS as the jdatapath.dll
-- * we include is compiled for 32-bit. In this case, we just have to dig up
-- * environment variables and try our best to find a user-specific path.
-- */
--
-- logger.warn("Failed to use jdatapath to detect user data path: resorting to environment variables");
--
-- File parentDir = null;
-- String appData = System.getenv("APPDATA");
-- if (appData != null && appData.length() > 0) {
-- // e.g., C:\Users\[userid]\AppData\Roaming
-- parentDir = new File(appData);
-- } else {
-- String userProfile = System.getenv("USERPROFILE");
-- if (userProfile != null && userProfile.length() > 0) {
-- // e.g., C:\Users\[userid]
-- parentDir = new File(userProfile);
-- }
-- }
--
-- if (parentDir == null) {
-- parentDir = new File(".");
-- }
--
-- dataDir = new File(parentDir, "OpenRefine");
-- grefineDir = new File(new File(parentDir, "Google"), "Refine");
-- gridworksDir = new File(parentDir, "Gridworks");
-- }
-- } else if (os.contains("os x")) {
-+ if (os.contains("os x")) {
- // on macosx, use "~/Library/Application Support"
- String home = System.getProperty("user.home");
-
=====================================
debian/patches/no-java-files.patch
=====================================
@@ -8,7 +8,7 @@ Subject: no java files
2 files changed, 10 deletions(-)
diff --git a/main/pom.xml b/main/pom.xml
-index 3f4de9e..7e5df81 100644
+index e7b9d08..fc531bc 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -33,11 +33,6 @@
@@ -24,7 +24,7 @@ index 3f4de9e..7e5df81 100644
<testResources>
<testResource>
diff --git a/server/pom.xml b/server/pom.xml
-index 841101d..1f71544 100644
+index 8186df4..8e44d6a 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -27,11 +27,6 @@
=====================================
debian/patches/openrefine-bin.patch
=====================================
@@ -4,13 +4,31 @@ Subject: openrefine bin
Customize the refine start script. First iteration.
---
- refine | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
+ refine | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/refine b/refine
-index 0fea3b2..81342e3 100755
+index c5886a2..6e4bc5d 100755
--- a/refine
+++ b/refine
+@@ -9,7 +9,7 @@
+ fail () {
+ cat <<EOF
+ ERROR: $1
+-Type '$0 -h' for usage information.
++Type 'openrefine -h' for usage information.
+ EOF
+ exit 1
+ }
+@@ -26,7 +26,7 @@ warn() {
+
+ usage() {
+ cat <<EOF
+-Usage: $0 [options] <action>
++Usage: openrefine [options] <action>
+ where [options] include:
+
+ -h print this message and exit
@@ -297,12 +297,6 @@ dist_prepare() {
fi
}
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,5 @@
build.patch
-jdatapath.patch
openrefine-bin.patch
no-java-files.patch
google-http-client-jackson2.patch
+butterfly.properties.patch
=====================================
debian/rules
=====================================
@@ -24,6 +24,20 @@ LINK_JARS_WEBAPP += vicino xercesImpl xml-apis xmlbeans
LINK_JARS_WEBAPP += httpclient5 httpcore5 httpcore5-h2 utils marc4j javax.activation tomcat9-annotations-api
LINK_JARS_WEBAPP += jetty9-continuation jetty9-http jetty9-io jetty9-servlets jetty9-util
+LINK_JARS_EXT_WIKIDATA := signpost-core okhttp-urlconnection okhttp wdtk-wikibaseapi threeten-extra
+LINK_JARS_EXT_WIKIDATA += jackson-annotations commons-lang3 wdtk-datamodel commons-compress commons-codec
+LINK_JARS_EXT_WIKIDATA += jackson-core okhttp-signpost okio wdtk-util jackson-databind
+
+LINK_JARS_EXT_JYTHON := jython
+
+LINK_JARS_EXT_GDATA := grpc-context opencensus-contrib-http-util commons-logging jsr305 httpclient
+LINK_JARS_EXT_GDATA += google-oauth-client google-api-services-sheets httpcore google-api-services-drive
+LINK_JARS_EXT_GDATA += google-api-client opencensus-api google-http-client-jackson2 commons-codec guava google-http-client
+
+LINK_JARS_EXT_DATABASE := encoder grpc-context opencensus-contrib-http-util commons-logging jsr305 httpclient postgresql
+LINK_JARS_EXT_DATABASE += httpcore jackson-annotations commons-lang3 opencensus-api google-http-client-jackson2 commons-codec
+LINK_JARS_EXT_DATABASE += guava mariadb-java-client jasypt google-http-client
+
%:
dh $@
@@ -31,6 +45,11 @@ override_dh_install:
find main/webapp/WEB-INF/ -name "*.jar" -delete
find main/webapp/WEB-INF/ -name "*.java" -delete
find server/classes/ -name "*.java" -delete
+ find extensions/ -type f \( -iname "LICENSE*" -o -name "*.java" -o -name "*.jar" -o -name ".project" -o -name "*.settings" -o -name "pom.xml" \) -delete
+ find extensions/ -type d -depth -name "tests" -exec rm -r "{}" \;
+ find extensions/ -type d -depth -name "target" -exec rm -r "{}" \;
+ find extensions/ -type d -depth -name "src" -exec rm -r "{}" \;
+ find extensions/ -type d -depth -name "licenses" -exec rm -r "{}" \;
dh_install
$(RM) -r $(CURDIR)/debian/openrefine/usr/share/maven-repo
@@ -41,3 +60,15 @@ override_dh_link:
for JAR in $(LINK_JARS_WEBAPP); do \
dh_link /usr/share/java/$$JAR.jar /usr/share/openrefine/webapp/WEB-INF/lib/$$JAR.jar; \
done
+ for JAR in $(LINK_JARS_EXT_WIKIDATA); do \
+ dh_link /usr/share/java/$$JAR.jar /usr/share/openrefine/webapp/extensions/wikidata/module/MOD-INF/lib/$$JAR.jar; \
+ done
+ for JAR in $(LINK_JARS_EXT_JYTHON); do \
+ dh_link /usr/share/java/$$JAR.jar /usr/share/openrefine/webapp/extensions/jython/module/MOD-INF/lib/$$JAR.jar; \
+ done
+ for JAR in $(LINK_JARS_EXT_GDATA); do \
+ dh_link /usr/share/java/$$JAR.jar /usr/share/openrefine/webapp/extensions/gdata/module/MOD-INF/lib/$$JAR.jar; \
+ done
+ for JAR in $(LINK_JARS_EXT_DATABASE); do \
+ dh_link /usr/share/java/$$JAR.jar /usr/share/openrefine/webapp/extensions/database/module/MOD-INF/lib/$$JAR.jar; \
+ done
View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/compare/3eca50faf99c8e323528dd3a2d6be75b66d2a7f2...d8d868964ab28320d55664d2a50a88abd9bf86dd
--
View it on GitLab: https://salsa.debian.org/java-team/openrefine/-/compare/3eca50faf99c8e323528dd3a2d6be75b66d2a7f2...d8d868964ab28320d55664d2a50a88abd9bf86dd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20211017/aa7cd39a/attachment.htm>
More information about the pkg-java-commits
mailing list