[med-svn] r16863 - in trunk/packages/camitk/trunk/debian: . patches
Emmanuel Promayon
promayon-guest at moszumanska.debian.org
Fri May 2 14:06:14 UTC 2014
Author: promayon-guest
Date: 2014-05-02 14:06:14 +0000 (Fri, 02 May 2014)
New Revision: 16863
Removed:
trunk/packages/camitk/trunk/debian/patches/camitk-imp-categories.diff
trunk/packages/camitk/trunk/debian/patches/load-private-lib-if-needed.diff
trunk/packages/camitk/trunk/debian/patches/remove-svn-revision.diff
trunk/packages/camitk/trunk/debian/patches/wizard-copy-proper-findcamitk.diff
Modified:
trunk/packages/camitk/trunk/debian/rules
Log:
remove not working badly designed test and old patches (applied upstream)
Deleted: trunk/packages/camitk/trunk/debian/patches/camitk-imp-categories.diff
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/camitk-imp-categories.diff 2014-05-01 19:05:53 UTC (rev 16862)
+++ trunk/packages/camitk/trunk/debian/patches/camitk-imp-categories.diff 2014-05-02 14:06:14 UTC (rev 16863)
@@ -1,9 +0,0 @@
---- a/sdk/applications/imp/camitk-imp.desktop
-+++ b/sdk/applications/imp/camitk-imp.desktop
-@@ -8,5 +8,5 @@
- Comment[fr]=Prototypage d'applications en Gestes Médico-Chirurgicaux Assistés par Ordinateur
- Exec=camitk-imp %f
- Icon=camitk
--Categories=Graphics;Science;Medicine;
-+Categories=Graphics;Science;MedicalSoftware;ImageProcessing;3DGraphics;DataVisualization
- MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-fits;image/x-png;image/x-psd;image/x-xbitmap;application/dicom;
Deleted: trunk/packages/camitk/trunk/debian/patches/load-private-lib-if-needed.diff
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/load-private-lib-if-needed.diff 2014-05-01 19:05:53 UTC (rev 16862)
+++ trunk/packages/camitk/trunk/debian/patches/load-private-lib-if-needed.diff 2014-05-02 14:06:14 UTC (rev 16863)
@@ -1,61 +0,0 @@
---- a/sdk/libraries/core/ExtensionManager.cpp
-+++ b/sdk/libraries/core/ExtensionManager.cpp
-@@ -46,10 +46,15 @@
- QDir privateLibDir(Core::getGlobalInstallDir());
- if (privateLibDir.cd("lib/"+QString(Core::shortVersion))) {
- QByteArray privateLibDirPath = privateLibDir.canonicalPath().toUtf8();
-+#ifdef WIN32
-+ // update path for windows
- QByteArray path = qgetenv("PATH");
- path.append(";");
- path.append(privateLibDirPath);
- qputenv("PATH",path);
-+#endif
-+ // update the application / qt plugins library path
-+ Application::instance()->addLibraryPath(privateLibDirPath);
- }
-
- autoload(COMPONENT);
-@@ -123,18 +128,26 @@
- QObject *plugin = pluginLoader.instance();
-
- if (!plugin) {
-- errorStrings << QString("Plugin " + fileName + ", error: " + pluginLoader.errorString());
-+ errorStrings << QString("Plugin " + fileName + ", error: " + pluginLoader.errorString());
- }
- else {
- errorStrings << QString("Plugin " + fileName + ", no error (you need to decrease your number of dependency level, or contact the CamiTK SDK developer team)");
- }
- }
-+
- QMessageBox::warning(NULL, "ExtensionManager Opening Error...",
- "AutoLoad plugin failed after " + QString::number(tryNr) + " tries for the following extension(s):<ul><li>"
- + errorStrings.join("</li><li>")
- + "</li></ul>"
- + "List of library paths:<ul><li>"
- + Application::instance()->libraryPaths().join("</li><li>")
-+ + "</li></ul>"
-+ + "List of path:<ul><li>"
-+#ifdef WIN32
-+ + QString(qgetenv("PATH")).split(":").join("</li><li>")
-+#else
-+ + QString(qgetenv("LD_LIBRARY_PATH")).split(":").join("</li><li>")
-+#endif
- + "</li></ul>");
-
- }
-@@ -214,6 +227,14 @@
- }
- else {
- pluginLoader.unload(); // to make sure we could try again later
-+
-+ // try to load the missing shared object directly from private dir (give absolute path)
-+ QRegExp libname("\\((lib.*): cannot open shared object file");
-+ if (libname.indexIn(pluginLoader.errorString(), 0)!= -1) {
-+ QString privateLibToLoad=Core::getGlobalInstallDir() + "/lib/" + QString(Core::shortVersion) + "/" + libname.cap(1);
-+ QLibrary privateLib(privateLibToLoad);
-+ privateLib.load();
-+ }
- }
-
- return returnValue;
Deleted: trunk/packages/camitk/trunk/debian/patches/remove-svn-revision.diff
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/remove-svn-revision.diff 2014-05-01 19:05:53 UTC (rev 16862)
+++ trunk/packages/camitk/trunk/debian/patches/remove-svn-revision.diff 2014-05-02 14:06:14 UTC (rev 16863)
@@ -1,11 +0,0 @@
---- a/sdk/libraries/core/CamiTKVersion.h
-+++ b/sdk/libraries/core/CamiTKVersion.h
-@@ -28,7 +28,7 @@
-
- namespace camitk
- {
--const char * Core::version = "CamiTK 3.2.0.857";
-+const char * Core::version = "CamiTK 3.2.0";
- const char * Core::shortVersion = "camitk-3.2";
- const char * Core::soVersion = "3";
- const char * Core::debugPostfix = "-debug";
Deleted: trunk/packages/camitk/trunk/debian/patches/wizard-copy-proper-findcamitk.diff
===================================================================
--- trunk/packages/camitk/trunk/debian/patches/wizard-copy-proper-findcamitk.diff 2014-05-01 19:05:53 UTC (rev 16862)
+++ trunk/packages/camitk/trunk/debian/patches/wizard-copy-proper-findcamitk.diff 2014-05-02 14:06:14 UTC (rev 16863)
@@ -1,16 +0,0 @@
---- a/sdk/applications/wizard/ExtensionGenerator.cpp
-+++ b/sdk/applications/wizard/ExtensionGenerator.cpp
-@@ -142,9 +142,10 @@
- void ExtensionGenerator::generateCMakeLists() throw (QString) {
- // Copying FindCamiTK.cmake
- std::cout << "Copying FindCamiTK.cmake..." << std::endl;
-- QDir cMakeModuleDir = camitk::Core::getTestDataDir();
-- cMakeModuleDir.cdUp();
-- cMakeModuleDir.cd("cmake");
-+ QDir cMakeModuleDir(camitk::Core::getGlobalInstallDir());
-+ if (!cMakeModuleDir.cd("share/"+QString(camitk::Core::shortVersion)+"/cmake")) {
-+ std::cerr << "Error: directory \"" << QString(QString(camitk::Core::getGlobalInstallDir())+"share/"+QString(camitk::Core::shortVersion)+"/cmake").toStdString() << "\" not found" << std::endl;
-+ }
- QFile findCamiTK(cMakeModuleDir.canonicalPath()+"/"+"FindCamiTK.cmake");
- std::cout << "Copying " << findCamiTK.fileName().toStdString() << std::endl;
- findCamiTK.copy(this->srcDir.canonicalPath() + "/" + "FindCamiTK.cmake");
Modified: trunk/packages/camitk/trunk/debian/rules
===================================================================
--- trunk/packages/camitk/trunk/debian/rules 2014-05-01 19:05:53 UTC (rev 16862)
+++ trunk/packages/camitk/trunk/debian/rules 2014-05-02 14:06:14 UTC (rev 16863)
@@ -81,7 +81,7 @@
# Component extension tests
ldd -r camitk-build/bin/camitk-testcomponents || echo "ok"
# Another way: xvfb-run --auto-servernum $(MAKE) -C camitk-build ARGS="-V -I 1,1,,1,...etc..." test
- (cd camitk-build && xvfb-run --auto-servernum ctest -V -I 1,1,,1,6 --timeout 300)
+ (cd camitk-build && xvfb-run --auto-servernum ctest -V -I 1,1,,1 --timeout 300)
# Action extensions tests (100% coverage here)
(cd camitk-build && xvfb-run --auto-servernum ctest -V -I 20,20,,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35 --timeout 300)
# Standalone lib test (0% coverage)
More information about the debian-med-commit
mailing list