moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-09 05:51:31 -04:00
Code Issues Releases Wiki Activity

Use the jna.jar from the system repository to make sure the version matches the corresponding libjnidispatch.so native library

Browse Source
This commit is contained in:
Reinhard Pointner 2019-03-07 18:53:54 +07:00
parent 23df26fad4
commit 33e03e39b9
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.properties
View File

@ -73,7 +73,7 @@ mac.application.category: public.app-category.utilities
deb.application.categories: AudioVideo;Video;Utility;FileTools; deb.application.categories: AudioVideo;Video;Utility;FileTools;
deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*; deb.application.mimetype: inode/directory;video/*;audio/*;text/*;application/*;
deb.application.class: net-filebot-Main deb.application.class: net-filebot-Main
deb.jna.depends: libjnidispatch.so deb.jna.depends: jna.jar, libjnidispatch.so
# Package Options # Package Options
tar.compression: xz tar.compression: xz

6
build.xml
View File

@ -572,8 +572,8 @@
<property name="dir.staging" location="${dir.dist}/deb-universal" /> <property name="dir.staging" location="${dir.dist}/deb-universal" />
<!-- use Debian package structure --> <!-- use Debian package structure -->
<copy-replace todir="${dir.staging}"> <copy-replace todir="${dir.staging}/share">
<fileset dir="${dir.installer}/deb" /> <fileset dir="${dir.installer}/deb/share" />
</copy-replace> </copy-replace>
<copy-replace todir="${dir.staging}"> <copy-replace todir="${dir.staging}">
<fileset dir="${dir.installer}/deb-universal" /> <fileset dir="${dir.installer}/deb-universal" />
@ -581,7 +581,7 @@
<jdeb destfile="${dir.dist}/${application.name}_${application.version}_universal.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true"> <jdeb destfile="${dir.dist}/${application.name}_${application.version}_universal.deb" control="${dir.staging}/control" compression="${tar.compression}" verbose="true">
<tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" /> <tarfileset prefix="/usr/share/filebot/bin" dir="${dir.staging}" includes="*.sh" filemode="755" />
<tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" /> <tarfileset prefix="/usr/share/filebot/jar" dir="${dir.dist}/lib" excludes="${deb.jna.depends}" />
<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" /> <tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
<tarfileset prefix="/usr/share" dir="${dir.staging}/share" /> <tarfileset prefix="/usr/share" dir="${dir.staging}/share" />

2
installer/deb-universal/control/control
View File

@ -8,5 +8,5 @@ Homepage: @{package.homepage}
Section: utils Section: utils
Priority: extra Priority: extra
Depends: openjdk-@{jvm.version}-jre Depends: openjdk-@{jvm.version}-jre
Recommends: openjfx, libjna-jni, libmediainfo0v5, libchromaprint-tools, p7zip-full, unrar Recommends: openjfx, libjna-java, mediainfo, libchromaprint-tools, p7zip-full, unrar
Enhances: nautilus-actions Enhances: nautilus-actions

7
installer/deb-universal/control/postinst Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# link filebot command
ln -sf /usr/share/filebot/bin/filebot.sh /usr/bin/filebot
# link system JNA library
ln -sf /usr/share/java/jna.jar /usr/share/filebot/jar/jna.jar

7
installer/deb-universal/control/prerm Normal file
View File

@ -0,0 +1,7 @@
#!/bin/sh
# unlink filebot command
rm -f /usr/bin/filebot
# unlink system JNA library
rm -f /usr/share/filebot/jar/jna.jar