Commit b819329c authored by Alf Gaida's avatar Alf Gaida

Removed not needed patches

Fixed debian/nomacs.install and debian/nomacs-l10n.install
parent e66fe478
nomacs (3.12.0+dfsg-2) unstable; urgency=medium
* Removed not needed patches
* Fixed debian/nomacs.install and debian/nomacs-l10n.install
-- Alf Gaida <agaida@siduction.org> Tue, 13 Nov 2018 20:20:42 +0100
nomacs (3.12.0+dfsg-1) unstable; urgency=medium
* Cherry-picked new upstream release 3.12.0.
......
usr/share/nomacs/translations/
usr/share/nomacs/Image?Lounge/translations/
......@@ -4,7 +4,7 @@ usr/share/pixmaps/nomacs.svg
usr/share/applications/nomacs.desktop
usr/share/man/man1/nomacs.1
usr/share/metainfo/nomacs.appdata.xml
usr/share/nomacs/themes/
usr/share/nomacs/Image?Lounge/themes/
usr/lib/nomacs/libnomacsCore.so.3.*
usr/lib/nomacs/libnomacsCore.so
......
Description: Revert some upstream changes
* we don't install in usr/share/nomacs/Image Lounge/
* we don't rename the application name and therefor the config name
Copyright: Alf Gaida <agaida@siduction.org>
Last-Update: 2018-10-27
--- nomacs-3.12.0+dfsg.orig/cmake/UnixBuildTarget.cmake
+++ nomacs-3.12.0+dfsg/cmake/UnixBuildTarget.cmake
@@ -77,7 +77,7 @@ install(FILES nomacs.desktop DESTINATION
# icon
install(FILES src/img/nomacs.svg DESTINATION share/pixmaps)
# translations
-install(FILES ${NOMACS_QM} DESTINATION "share/nomacs/Image Lounge/translations")
+install(FILES ${NOMACS_QM} DESTINATION "share/nomacs/translations")
# manpage
if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
install(FILES Readme/nomacs.1 DESTINATION man/man1)
@@ -89,7 +89,7 @@ install(FILES nomacs.appdata.xml DESTINA
# themes
file(GLOB NMC_THEMES "src/themes/*.css")
-install(FILES ${NMC_THEMES} DESTINATION "share/nomacs/Image Lounge/themes")
+install(FILES ${NMC_THEMES} DESTINATION "share/nomacs/themes")
# "make dist" target
string(TOLOWER ${PROJECT_NAME} CPACK_PACKAGE_NAME)
--- nomacs-3.12.0+dfsg.orig/src/main.cpp
+++ nomacs-3.12.0+dfsg/src/main.cpp
@@ -80,17 +80,11 @@ int main(int argc, wchar_t *argv[]) {
int main(int argc, char *argv[]) {
#endif
-#ifdef READ_TUWIEN
- QCoreApplication::setOrganizationName("TU Wien");
- QCoreApplication::setOrganizationDomain("https://nomacs.org");
- QCoreApplication::setApplicationName("nomacs [READ]");
-#else
- QCoreApplication::setOrganizationName("nomacs");
- QCoreApplication::setOrganizationDomain("https://nomacs.org");
- QCoreApplication::setApplicationName("Image Lounge");
-#endif
-
- nmc::DkUtils::registerFileVersion();
+//QCoreApplication::setOrganizationName("nomacs");
+QCoreApplication::setOrganizationDomain("https://nomacs.org");
+QCoreApplication::setApplicationName("nomacs");
+
+nmc::DkUtils::registerFileVersion();
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment