[otb] 04/08: Drop patches, applied upstream.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository otb.

commit aed85e13d5c0357af3aeb02ae6031c61327ffebf
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Feb 14 18:45:21 2017 +0100

    Drop patches, applied upstream.
---
 debian/changelog                                   |  1 +
 .../desktop-entry-lacks-keywords-entry.patch       | 12 -----
 debian/patches/desktop-otb-application-path.patch  | 53 ----------------------
 debian/patches/monteverdi-icons.patch              | 19 --------
 debian/patches/series                              |  3 --
 5 files changed, 1 insertion(+), 87 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9bcb767..c1eca9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ otb (5.10.0+dfsg-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 14 Feb 2017 18:31:39 +0100
 
diff --git a/debian/patches/desktop-entry-lacks-keywords-entry.patch b/debian/patches/desktop-entry-lacks-keywords-entry.patch
deleted file mode 100644
index 4700e57..0000000
--- a/debian/patches/desktop-entry-lacks-keywords-entry.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Add Keywords to desktop entry file.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1324
-Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commitdiff/e9198ab3e6c4e517cce60f8a34d366d5f24abcdf
-
---- a/Utilities/Data/monteverdi.desktop
-+++ b/Utilities/Data/monteverdi.desktop
-@@ -11,3 +11,4 @@ StartupNotify=false
- Icon=monteverdi
- Categories=Education;Science;ImageProcessing;Geography;Qt;
- MimeType=image/tiff;image/jpeg;image/jp2;application/x-esri-shape;
-+Keywords=otb;orfeo;toolbox;osgeo;
diff --git a/debian/patches/desktop-otb-application-path.patch b/debian/patches/desktop-otb-application-path.patch
deleted file mode 100644
index a52f7fb..0000000
--- a/debian/patches/desktop-otb-application-path.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Set OTB_APPLICATION_PATH environment variable for monteverdi executable.
- See: https://lists.osgeo.org/pipermail/live-demo/2017-February/011786.html
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1355
-Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commitdiff/cb38ea6fa564b73311373e2c2aa330b82ad74dbf
-
---- a/Utilities/Data/monteverdi.desktop
-+++ /dev/null
-@@ -1,14 +0,0 @@
--[Desktop Entry]
--Type=Application
--Name=Monteverdi
--Name[fr_FR]=Monteverdi
--GenericName=Image processing
--Comment=Remote sensing image processing application based on OrfeoToolbox
--TryExec=/usr/bin/monteverdi
--Exec=/usr/bin/monteverdi %F
--Terminal=false
--StartupNotify=false
--Icon=monteverdi
--Categories=Education;Science;ImageProcessing;Geography;Qt;
--MimeType=image/tiff;image/jpeg;image/jp2;application/x-esri-shape;
--Keywords=otb;orfeo;toolbox;osgeo;
---- /dev/null
-+++ b/Utilities/Data/monteverdi.desktop.in
-@@ -0,0 +1,14 @@
-+[Desktop Entry]
-+Type=Application
-+Name=Monteverdi
-+Name[fr_FR]=Monteverdi
-+GenericName=Image processing
-+Comment=Remote sensing image processing application based on OrfeoToolbox
-+TryExec=@CMAKE_INSTALL_PREFIX@/bin/monteverdi
-+Exec=env OTB_APPLICATION_PATH=@CMAKE_INSTALL_PREFIX@/@OTB_INSTALL_APP_DIR@ @CMAKE_INSTALL_PREFIX@/bin/monteverdi %F
-+Terminal=false
-+StartupNotify=false
-+Icon=monteverdi
-+Categories=Education;Science;ImageProcessing;Geography;Qt;
-+MimeType=image/tiff;image/jpeg;image/jp2;application/x-esri-shape;
-+Keywords=otb;orfeo;toolbox;osgeo;
---- a/Utilities/Data/CMakeLists.txt
-+++ b/Utilities/Data/CMakeLists.txt
-@@ -36,7 +36,9 @@ install(FILES Icons/monteverdi-32x32.xpm
- # -------------------------
- # Install freedesktop entry
- 
--install(FILES monteverdi.desktop
-+configure_file(monteverdi.desktop.in ${CMAKE_BINARY_DIR}/monteverdi.desktop)
-+
-+install(FILES ${CMAKE_BINARY_DIR}/monteverdi.desktop
-         DESTINATION share/applications
-         COMPONENT Resources)
- 
diff --git a/debian/patches/monteverdi-icons.patch b/debian/patches/monteverdi-icons.patch
deleted file mode 100644
index a14eeae..0000000
--- a/debian/patches/monteverdi-icons.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Install monteverdi icons along with the application.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1323
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -373,6 +373,12 @@ install(FILES "LICENSE" DESTINATION ${OT
- configure_file(VERSION VERSION @ONLY)
- install(FILES ${OTB_BINARY_DIR}/VERSION DESTINATION ${OTB_INSTALL_DOC_DIR} COMPONENT Runtime)
- 
-+# Install icons if application module is enabled
-+list(FIND _enabled_modules "OTBMonteverdi" _index)
-+if(${_index} GREATER -1)
-+  add_subdirectory(Utilities/Data)
-+endif()
-+
- if(BUILD_TESTING)
-   add_subdirectory(Utilities/InstallTest)
- endif()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 050b1f5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-monteverdi-icons.patch
-desktop-entry-lacks-keywords-entry.patch
-desktop-otb-application-path.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git