[saga] 06/11: Drop patches applied upstream, refresh remaining patches.

Bas Couwenberg sebastic at debian.org
Fri Jul 1 21:55:58 UTC 2016 

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

sebastic pushed a commit to branch master
in repository saga.

commit 14514acf7f7e5bbe797fb62783f658b9f82b891e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 1 20:58:08 2016 +0200

    Drop patches applied upstream, refresh remaining patches.
---
 debian/changelog                                  |   1 +
 debian/patches/0001-vigra-hdf5-include.patch      |   3 +-
 debian/patches/Use-debian-version-dxflib.patch    |  56 +++++++++-------------
 debian/patches/Use-debian-version-of-libsvm.patch |   2 +-
 debian/patches/fix-spelling.patch                 |  14 ------
 debian/patches/hicolor-icon-22x22.patch           |  25 ----------
 debian/patches/series                             |   2 -
 debian/rules                                      |   4 +-
 debian/saga_icon_22.png                           | Bin 1867 -> 0 bytes
 9 files changed, 27 insertions(+), 80 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fa8546..03c2f11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ saga (2.3.0+dfsg-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Drop patches applied upstream, refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 01 Jul 2016 20:21:37 +0200
 
diff --git a/debian/patches/0001-vigra-hdf5-include.patch b/debian/patches/0001-vigra-hdf5-include.patch
index 7ab954d..e62ae62 100644
--- a/debian/patches/0001-vigra-hdf5-include.patch
+++ b/debian/patches/0001-vigra-hdf5-include.patch
@@ -1,9 +1,10 @@
 Description: Add hdf5 include path to configure
 Author: Johan Van de Wauw <johan at vandewauw.be>
+Forwarded: not-needed
 
 --- a/src/modules/imagery/imagery_vigra/Makefile.am
 +++ b/src/modules/imagery/imagery_vigra/Makefile.am
-@@ -7,7 +7,7 @@
+@@ -7,7 +7,7 @@ endif
  
  if HAVE_VIGRA
  DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
diff --git a/debian/patches/Use-debian-version-dxflib.patch b/debian/patches/Use-debian-version-dxflib.patch
index 1be5e43..2e11b35 100644
--- a/debian/patches/Use-debian-version-dxflib.patch
+++ b/debian/patches/Use-debian-version-dxflib.patch
@@ -1,54 +1,42 @@
 Description: Use debian version of dxflib
 Author: Johan Van de Wauw <johan at vandewauw.be>
---- a/src/modules/io/io_shapes_dxf/Makefile.am
-+++ b/src/modules/io/io_shapes_dxf/Makefile.am
-@@ -8,25 +8,13 @@
- DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
- CXX_INCS           = -I$(top_srcdir)/src/saga_core
- AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
--AM_LDFLAGS         = -fPIC -shared -avoid-version 
-+AM_LDFLAGS         = -fPIC -shared -avoid-version -ldxflib
- pkglib_LTLIBRARIES = libio_shapes_dxf.la
- libio_shapes_dxf_la_SOURCES =\
- dxf_import.cpp\
- MLB_Interface.cpp\
--./dxflib/dl_dxf.cpp\
--./dxflib/dl_writer_ascii.cpp\
- dxf_import.h\
--MLB_Interface.h\
--./dxflib/dl_attributes.h\
--./dxflib/dl_codes.h\
--./dxflib/dl_creationadapter.h\
--./dxflib/dl_creationinterface.h\
--./dxflib/dl_dxf.h\
--./dxflib/dl_entities.h\
--./dxflib/dl_exception.h\
--./dxflib/dl_extrusion.h\
--./dxflib/dl_writer.h\
--./dxflib/dl_writer_ascii.h
-+MLB_Interface.h
- 
- libio_shapes_dxf_la_LIBADD = $(top_srcdir)/src/saga_core/saga_api/libsaga_api.la $(ADD_MLBS)
- 
+
 --- a/src/modules/io/io_shapes_dxf/dxf_import.cpp
 +++ b/src/modules/io/io_shapes_dxf/dxf_import.cpp
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,11 @@
  //---------------------------------------------------------
  #include "dxf_import.h"
  
--#include "./dxflib/dl_dxf.h"
++#ifdef SYSTEM_DXFLIB
 +#include <dxflib/dl_dxf.h>
++#else
+ #include "./dxflib/dl_dxf.h"
++#endif
  
  
  ///////////////////////////////////////////////////////////
 --- a/src/modules/io/io_shapes_dxf/dxf_import.h
 +++ b/src/modules/io/io_shapes_dxf/dxf_import.h
-@@ -74,7 +74,7 @@
+@@ -74,7 +74,11 @@
  //---------------------------------------------------------
  #include "MLB_Interface.h"
  
--#include "./dxflib/dl_creationadapter.h"
++#ifdef SYSTEM_DXFLIB
 +#include <dxflib/dl_creationadapter.h>
++#else
+ #include "./dxflib/dl_creationadapter.h"
++#endif
  
  
  ///////////////////////////////////////////////////////////
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU
+ AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
+ AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
+ AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
+-AC_CHECK_HEADER([dxflib/dl_dxf.h],[AC_CHECK_LIB(libdxf,DL_ArcData,LIBDXFFOUND=1)])
++PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1])
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/debian/patches/Use-debian-version-of-libsvm.patch b/debian/patches/Use-debian-version-of-libsvm.patch
index 626ce35..47e6dc3 100644
--- a/debian/patches/Use-debian-version-of-libsvm.patch
+++ b/debian/patches/Use-debian-version-of-libsvm.patch
@@ -3,7 +3,7 @@ Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
 
 --- a/src/modules/imagery/imagery_svm/Makefile.am
 +++ b/src/modules/imagery/imagery_svm/Makefile.am
-@@ -3,16 +3,14 @@
+@@ -3,16 +3,14 @@ DBGFLAGS = -g -DDEBUG
  endif
  
  DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch
deleted file mode 100644
index 052dd98..0000000
--- a/debian/patches/fix-spelling.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix typo
-Author: Johan Van de Wauw <johan at vandewauw.be>
-Applied-Upstream: https://sourceforge.net/p/saga-gis/code-0/2907/
---- a/src/modules/simulation/sim_hydrology/topmodel.cpp
-+++ b/src/modules/simulation/sim_hydrology/topmodel.cpp
-@@ -89,7 +89,7 @@
- 		"(Centre for Research on Environmental Systems and Statistics, "
- 		"Institute of Environmental and Biological Sciences, "
- 		"Lancaster University, Lancaster LA1 4YQ, UK) "
--		"and the C translation of the Fortran source codes implementated in GRASS.\n\n"
-+		"and the C translation of the Fortran source codes implemented in GRASS.\n\n"
- 
- 		"This program allows single or multiple subcatchment calculations "
- 		"but with single average rainfall and potential evapotranspiration "
diff --git a/debian/patches/hicolor-icon-22x22.patch b/debian/patches/hicolor-icon-22x22.patch
deleted file mode 100644
index 85dab87..0000000
--- a/debian/patches/hicolor-icon-22x22.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Also install 22x22 PNG icon in hicolor theme.
- For compliance with Debian Policy section 9.6:
- "
-  Unless hidden by default, the desktop entry must point to a PNG or SVG
-  icon with a transparent background, providing at least the 22×22 size,
-  and preferably up to 64×64. The icon should be neutral enough to
-  integrate well with the default icon themes. It is encouraged to ship
-  the icon in the default hicolor icon theme directories, or to use an
-  existing icon from the hicolor theme.
- "
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://sourceforge.net/p/saga-gis/bugs/231/
-Applied-Upstream: https://sourceforge.net/p/saga-gis/code-0/2912/
-
---- a/src/saga_core/saga_gui/Makefile.am
-+++ b/src/saga_core/saga_gui/Makefile.am
-@@ -223,7 +223,7 @@ dist_applications_DATA = res/saga.deskto
- pixmapdir = $(datadir)/pixmaps
- dist_pixmap_DATA = res/saga.png
- 
--ICON_SIZES = 8 16 24 32 48 64 72 80 96 128 192
-+ICON_SIZES = 8 16 22 24 32 48 64 72 80 96 128 192
- 
- install-icons:
- 	@for size in $(ICON_SIZES); do \
diff --git a/debian/patches/series b/debian/patches/series
index bb8e378..f57999a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 Use-debian-version-of-libsvm.patch
 0001-vigra-hdf5-include.patch
 Use-debian-version-dxflib.patch
-fix-spelling.patch
-hicolor-icon-22x22.patch
diff --git a/debian/rules b/debian/rules
index 81fb630..af7200e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,11 +20,9 @@ templates:
 	dh $@ --with python2 --with autoreconf --parallel
 
 override_dh_clean:
-	dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1 \
-	         src/saga_core/saga_gui/res/saga_icon_22.png
+	dh_clean src/saga_core/saga_api/saga_api.py saga_cmd.1 saga_gui.1
 
 override_dh_auto_configure: templates
-	cp debian/saga_icon_22.png src/saga_core/saga_gui/res/
 	dh_auto_configure -- \
 		--prefix=/usr \
 		--disable-libfire \
diff --git a/debian/saga_icon_22.png b/debian/saga_icon_22.png
deleted file mode 100644
index 08d7f27..0000000
Binary files a/debian/saga_icon_22.png and /dev/null differ

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

More information about the Pkg-grass-devel mailing list