The following commit has been merged in the master branch: commit 9446457c261af9cf765a9f9b7b7be3d50234a102 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Wed Mar 3 18:47:58 2010 +0100
Implement so naming scheme according to upstream comments diff --git a/configure.in b/configure.in index 0aced17..c5f88cb 100755 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(saga, 2.0, BUG-REPORT-ADDRESS) +AC_INIT(saga, 2.0.4, BUG-REPORT-ADDRESS) AC_CONFIG_SRCDIR([src/saga_core/saga_gui/wksp_data_menu_files.cpp]) AC_CONFIG_HEADER([config.h]) #AM_INIT_AUTOMAKE(saga, 2.0beta) diff --git a/debian/control b/debian/control index a0a397b..00b4674 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Description: System for Automatic Geoscientific Analysis altitudes. * Vector tools: polygon intersection, contour lines from grid. -Package: libsaga4-dev +Package: libsaga-2.0.4-dev Section: libdevel Architecture: any Suggests: saga (= ${binary:Version}) @@ -52,7 +52,7 @@ Description: SAGA GIS development files This package contains the header files for developing with SAGA. Install this package if you wish to develop software that uses the SAGA API. -Package: libsaga4 +Package: libsaga-2.0.4 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libsaga-2.0.4-dev.install b/debian/libsaga-2.0.4-dev.install new file mode 100644 index 0000000..87633ca --- /dev/null +++ b/debian/libsaga-2.0.4-dev.install @@ -0,0 +1,3 @@ +src/saga_core/saga_api/*.h /usr/include/saga_api/ +src/saga_core/saga_gdi/*.h /usr/include/saga_gdi/ + diff --git a/debian/libsaga4.install b/debian/libsaga-2.0.4.install similarity index 100% rename from debian/libsaga4.install rename to debian/libsaga-2.0.4.install diff --git a/debian/saga-dev.install b/debian/saga-dev.install deleted file mode 100644 index 19f2394..0000000 --- a/debian/saga-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -src/saga_core/saga_api/saga_api.h /usr/include/saga_api/ -src/saga_core/saga_api/*.h /usr/include/saga_api/ -src/saga_core/saga_gdi/*.h /usr/include/saga_gdi/ - diff --git a/src/saga_core/saga_api/Makefile.am b/src/saga_core/saga_api/Makefile.am index 594c14e..9c435a1 100644 --- a/src/saga_core/saga_api/Makefile.am +++ b/src/saga_core/saga_api/Makefile.am @@ -4,15 +4,14 @@ if DEBUG DBGFLAGS = -g -DDEBUG endif -SOVERSION = 4:0:0 if SAGA_UNICODE AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS) AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=yes --libs` -libsaga_api_la_LDFLAGS =$(AM_LDFLAGS) -version-info $(SOVERSION) +libsaga_api_la_LDFLAGS =$(AM_LDFLAGS) -release $(VERSION) else AM_CXXFLAGS = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS) AM_LDFLAGS = -fPIC -shared -Wall `wx-config --unicode=no --libs` -libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SOVERSION) +libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) endif lib_LTLIBRARIES = libsaga_api.la diff --git a/src/saga_core/saga_api/Makefile.in b/src/saga_core/saga_api/Makefile.in index fb35b55..294d5a2 100644 --- a/src/saga_core/saga_api/Makefile.in +++ b/src/saga_core/saga_api/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -238,13 +238,12 @@ top_srcdir = @top_srcdir@ # $Id: Makefile.am,v 1.17 2009/10/01 14:01:19 oconrad Exp $ # @debug_t...@dbgflags = -g -DDEBUG -SOVERSION = 4:0:0 @saga_unicode_fa...@am_cxxflags = -fPIC -Wall `wx-config --unicode=no --cxxflags` -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS) @saga_unicode_t...@am_cxxflags = -fPIC -Wall `wx-config --unicode=yes --cxxflags` -D_SAGA_LINUX -D_SAGA_UNICODE -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_API_EXPORTS -D_SAGA_DONOTUSE_HARU $(DBGFLAGS) @saga_unicode_fa...@am_ldflags = -fPIC -shared -Wall `wx-config --unicode=no --libs` @saga_unicode_t...@am_ldflags = -fPIC -shared -Wall `wx-config --unicode=yes --libs` -...@saga_unicode_false@libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SOVERSION) -...@saga_unicode_true@libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(SOVERSION) +...@saga_unicode_false@libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) +...@saga_unicode_true@libsaga_api_la_LDFLAGS = $(AM_LDFLAGS) -release $(VERSION) lib_LTLIBRARIES = libsaga_api.la libsaga_api_la_SOURCES = \ api_callback.cpp\ diff --git a/src/saga_core/saga_gdi/Makefile.am b/src/saga_core/saga_gdi/Makefile.am index c2b1879..f45232c 100644 --- a/src/saga_core/saga_gdi/Makefile.am +++ b/src/saga_core/saga_gdi/Makefile.am @@ -1,7 +1,6 @@ if DEBUG DBGFLAGS = -g -DDEBUG endif -SOVERSION = 0:0:0 if SAGA_UNICODE DEP_DEFS = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) DEP_LFLG = -fPIC -shared `wx-config --unicode=yes --static=no --libs` @@ -13,7 +12,7 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD CXX_INCS = -I$(top_srcdir)/src/saga_core AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) AM_LDFLAGS = $(DEP_LFLG) -libsaga_gdi_la_LDFLAGS =-version-info $(SOVERSION) +libsaga_gdi_la_LDFLAGS =--release $(RELEASE) lib_LTLIBRARIES = libsaga_gdi.la libsaga_gdi_la_SOURCES =\ sgdi_diagram.cpp\ diff --git a/src/saga_core/saga_gdi/Makefile.in b/src/saga_core/saga_gdi/Makefile.in index 7a72619..048a608 100644 --- a/src/saga_core/saga_gdi/Makefile.in +++ b/src/saga_core/saga_gdi/Makefile.in @@ -220,7 +220,6 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @debug_t...@dbgflags = -g -DDEBUG -SOVERSION = 0:0:0 @saga_unicode_fa...@dep_defs = -fPIC `wx-config --unicode=no --static=no --cxxflags` $(DBGFLAGS) @saga_unicode_t...@dep_defs = -fPIC `wx-config --unicode=yes --static=no --cxxflags` -D_SAGA_UNICODE $(DBGFLAGS) @saga_unicode_fa...@dep_lflg = -fPIC -shared `wx-config --unicode=no --static=no --libs` @@ -229,7 +228,7 @@ DEF_SAGA = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD CXX_INCS = -I$(top_srcdir)/src/saga_core AM_CXXFLAGS = $(CXX_INCS) $(DEF_SAGA) $(DEP_DEFS) $(DBGFLAGS) AM_LDFLAGS = $(DEP_LFLG) -libsaga_gdi_la_LDFLAGS = -version-info $(SOVERSION) +libsaga_gdi_la_LDFLAGS = -release $(RELEASE) lib_LTLIBRARIES = libsaga_gdi.la libsaga_gdi_la_SOURCES = \ sgdi_diagram.cpp\ -- Saga GIS _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel