[Pkg-phototools-devel] [PATCH 1/2] patches: removed all remaining patches.

[Stefan Peter]

Changes adopted by upstream.

Signed-off-by: Stefan Peter <s_peter at swissonline.ch>

diff --git a/debian/patches/42_stoplinklibXI_libXmu b/debian/patches/42_stoplinklibXI_libXmu
deleted file mode 100644
index 98bf8a5..0000000
--- a/debian/patches/42_stoplinklibXI_libXmu
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Andreas Metzler
-Description: Do not link unnecessarily against Xmu and Xi.
-
-diff -NurbBp a/CMakeModules/FindGLUT.cmake b/CMakeModules/FindGLUT.cmake
---- a/CMakeModules/FindGLUT.cmake	2010-07-16 22:37:17.000000000 +0200
-+++ b/CMakeModules/FindGLUT.cmake	2010-07-17 18:39:42.000000000 +0200
-@@ -70,8 +70,6 @@ IF(GLUT_INCLUDE_DIR)
-     # If not, we need some way to figure out what platform we are on.
-     SET( GLUT_LIBRARIES
-       ${GLUT_glut_LIBRARY}
--      ${GLUT_Xmu_LIBRARY}
--      ${GLUT_Xi_LIBRARY} 
-       ${GLUT_cocoa_LIBRARY}
-       )
-     SET( GLUT_FOUND "YES" )
diff --git a/debian/patches/43_fallbackhelp.patch b/debian/patches/43_fallbackhelp.patch
deleted file mode 100644
index 1ec328a..0000000
--- a/debian/patches/43_fallbackhelp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Andreas Metzler
-Description: Invoke sensible-browser instead of using 
- wxLaunchDefaultBrowser(). The latter does not work on e.g. windowmaker.
-
-diff -NurBbp hugin-2010.4.0/src/hugin1/hugin/MainFrame.cpp b/src/hugin1/hugin/MainFrame.cpp
---- hugin-2010.4.0/src/hugin1/hugin/MainFrame.cpp	2010-11-26 20:29:24.000000000 +0100
-+++ b/src/hugin1/hugin/MainFrame.cpp	2010-11-27 12:03:02.000000000 +0100
-@@ -1103,7 +1103,10 @@ void MainFrame::OnAddTimeImages( wxComma
- 
- void MainFrame::OnShowDonate(wxCommandEvent & e)
- {
--    wxLaunchDefaultBrowser(wxT("http://sourceforge.net/project/project_donations.php?group_id=77506"));
-+  wxString cmd = wxT("sensible-browser http://sourceforge.net/project/project_donations.php?group_id=77506");
-+
-+  wxExecute(cmd, wxEXEC_ASYNC);
-+    /* wxLaunchDefaultBrowser(wxT("http://sourceforge.net/project/project_donations.php?group_id=77506")); */
- }
- 
- 
-@@ -1239,7 +1242,9 @@ void MainFrame::DisplayHelp(wxString sec
-         return;
-     }
-     DEBUG_INFO("help file: " << strFile.mb_str(wxConvLocal));
--    if(!wxLaunchDefaultBrowser(strFile))
-+    /* if(!wxLaunchDefaultBrowser(strFile)) */
-+    wxString cmd = wxT("sensible-browser ") + strFile;
-+    if (!::wxExecute(cmd, wxEXEC_ASYNC))
-     {
-         wxLogError(_("Can't start system's web browser"));
-     }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0ebbb9b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-42_stoplinklibXI_libXmu
-43_fallbackhelp.patch
-- 
1.9.1