[ossim] 02/25: Updated patchset.
Francesco Lovergine
frankie at moszumanska.debian.org
Wed Mar 5 13:54:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch master
in repository ossim.
commit 29a631155b76994da3fddf9609b3000eebadd387
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Fri Mar 16 12:20:40 2012 +0100
Updated patchset.
---
debian/changelog | 9 ++++--
debian/control | 11 ++++---
debian/patches/kfreebsd | 22 ++++++++++++++
debian/patches/series | 2 ++
debian/patches/soname | 77 +++++++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 1 +
6 files changed, 114 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c4ffbf4..7b0dbc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,18 +2,23 @@ ossim (1.8.10+5-1) unstable; urgency=low
* New upstream release as taken from upstream svn.
* Moved debian repository to git with new packaging style to simplify
- mantainership.
+ mantainership. New Vcs-* fields set.
* Policy bumped to 3.9.3.
* Debhelper level set to 8.
* Annotated README.source about getting upstream source.
* Moved to source format 3.0.
* Now builds using TIFF 5 library and depending.
* Build-deps updated to current flavors.
+ * Fixed multiarch jpeg detection at configuration time.
+ (closes: #640819)
* SONAME appears dummy, so better being pro-active and assigning a new
one with strict version dependency. This is done in a new patch
`soname'.
+ * Added support for kfreebsd with patch `kfreebsd' by updating
+ the configure file.
+ (closes: #628413)
- -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 12 Mar 2012 13:08:35 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org> Thu, 15 Mar 2012 18:01:08 +0100
ossim (1.7.21-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 50f065f..b77d39c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,10 +10,10 @@ Build-Depends: cdbs, debhelper (>= 8), libopenscenegraph-dev,
libtar-dev, libfreetype6-dev, autotools-dev
Standards-Version: 3.9.3
Homepage: http://www.ossim.org/
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/ossim/trunk
-Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/ossim/trunk
+Vcs-Browser: http://git.debian.org/?p=pkg-grass/ossim.git
+Vcs-Git: git://git.debian.org/git/pkg-grass/ossim.git
-Package: libossim1
+Package: libossim1.8.10
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -41,8 +41,7 @@ Description: The OSSIM library -- shared library
Package: libossim-dev
Architecture: any
Section: libdevel
-Depends: libossim1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
- libgeotiff-dev
+Depends: libossim1.8.10 (= ${binary:Version}), ${misc:Depends}, libgeotiff-dev
Description: The OSSIM library -- development files
Open Source Software Image Map (OSSIM) is a high performance engine for
remote sensing, image processing, geographical information systems and
@@ -67,7 +66,7 @@ Description: The OSSIM library -- development files
Package: ossim-core
Architecture: any
-Depends: libossim1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: The OSSIM core utilities
Open Source Software Image Map (OSSIM) is a high performance engine for
remote sensing, image processing, geographical information systems and
diff --git a/debian/patches/kfreebsd b/debian/patches/kfreebsd
new file mode 100644
index 0000000..4ce10d7
--- /dev/null
+++ b/debian/patches/kfreebsd
@@ -0,0 +1,22 @@
+Index: ossim/configure
+===================================================================
+--- ossim.orig/configure 2012-03-15 16:47:05.000000000 +0100
++++ ossim/configure 2012-03-15 17:52:43.000000000 +0100
+@@ -8346,7 +8346,7 @@
+ HOST_RESULT=hpux
+ SO_VERSIONLESS_EXT=sl
+ ;;
+- *-*-linux* )
++ *-*-linux* | *-*-kfreebsd* )
+ OSSIM_USE_LINUX=1
+ cat >>confdefs.h <<\_ACEOF
+ #define __OSSIM_LINUX__ 1
+@@ -9320,7 +9320,7 @@
+ case "${host}" in
+ *-hp-hpux* )
+ ;;
+- *-*-linux* )
++ *-*-linux* | *-*-kfreebsd* )
+ ;;
+ *-*-solaris2* )
+ LD_SHARED="${CXX} -shared "
diff --git a/debian/patches/series b/debian/patches/series
index bd93ce0..bb923ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
jpeg
+soname
+kfreebsd
diff --git a/debian/patches/soname b/debian/patches/soname
new file mode 100644
index 0000000..a5c400f
--- /dev/null
+++ b/debian/patches/soname
@@ -0,0 +1,77 @@
+Index: ossim/configure
+===================================================================
+--- ossim.orig/configure 2012-03-16 12:10:59.000000000 +0100
++++ ossim/configure 2012-03-16 12:13:51.000000000 +0100
+@@ -596,8 +596,8 @@
+ # Identity of this package.
+ PACKAGE_NAME='ossim'
+ PACKAGE_TARNAME='ossim'
+-PACKAGE_VERSION='1.8.4'
+-PACKAGE_STRING='ossim 1.8.4'
++PACKAGE_VERSION='1.8.10'
++PACKAGE_STRING='ossim 1.8.10'
+ PACKAGE_BUGREPORT='http://bugzilla.remotesensing.org'
+
+ # Factoring default headers for most tests.
+@@ -1961,7 +1961,7 @@
+
+ OSSIM_MAJOR_VERSION_NUMBER=1
+ OSSIM_MINOR_VERSION_NUMBER=8
+-OSSIM_RELEASE_NUMBER=4
++OSSIM_RELEASE_NUMBER=10
+
+
+ OSSIM_VERSION=${OSSIM_MAJOR_VERSION_NUMBER}.${OSSIM_MINOR_VERSION_NUMBER}.${OSSIM_RELEASE_NUMBER}
+@@ -8323,7 +8323,7 @@
+ STATIC_OBJ_DIR=".static_obj"
+
+ SO_VERSIONLESS_EXT="so"
+-SO_SONAME_EXT="${SO_VERSIONLESS_EXT}.${OSSIM_MAJOR_VERSION_NUMBER}"
++SO_SONAME_EXT="${SO_VERSIONLESS_EXT}.${OSSIM_VERSION}"
+ SO_REALNAME_EXT="${SO_VERSIONLESS_EXT}.${OSSIM_VERSION}"
+ LD_SHARED="${CXX} -shared -Wl,-soname,\$(SHARED_LIB_SONAME)"
+
+Index: ossim/makefiles/unx/makelibcore
+===================================================================
+--- ossim.orig/makefiles/unx/makelibcore 2012-03-16 12:10:54.000000000 +0100
++++ ossim/makefiles/unx/makelibcore 2012-03-16 12:10:59.000000000 +0100
+@@ -8,7 +8,7 @@
+
+ OSSIM_LIB=libossim
+ SHARED_LIB_VERSIONLESS=$(OSSIM_LIB).$(SO_VERSIONLESS_EXT)
+-SHARED_LIB_SONAME=$(OSSIM_LIB).$(SO_SONAME_EXT)
++SHARED_LIB_SONAME=$(OSSIM_LIB).$(SO_REALNAME_EXT)
+ SHARED_LIB_REALNAME=$(OSSIM_LIB).$(SO_REALNAME_EXT)
+ SHARED_LIB_TARGET=$(OSSIM_LIB_PATH)/$(SHARED_LIB_REALNAME)
+ SHARED_OBJ_DIR_PATH=$(BASELIBPATH)/$(SHARED_OBJ_DIR)
+@@ -112,7 +112,7 @@
+ $(PARALLEL_ROOT)/$(SHARED_OBJ_DIR)/*.$(OBJEXT) \
+ $(PLUGIN_ROOT)/$(SHARED_OBJ_DIR)/*.$(OBJEXT) \
+ $(INIT_ROOT)/$(SHARED_OBJ_DIR)/*.$(OBJEXT) $(OSSIM_LIB_LINK) ; \
+-(cd $(OSSIM_LIB_PATH) ; $(RM_NOPROMPT) $(SHARED_LIB_SONAME) ; $(RM_NOPROMPT) $(SHARED_LIB_VERSIONLESS) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_SONAME) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_VERSIONLESS) ; ) ;
++(cd $(OSSIM_LIB_PATH) ; $(RM_NOPROMPT) $(SHARED_LIB_SONAME) ; $(RM_NOPROMPT) $(SHARED_LIB_VERSIONLESS) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_VERSIONLESS) ; ) ;
+ endef
+
+ else
+Index: ossim/makefiles/unx/makelib
+===================================================================
+--- ossim.orig/makefiles/unx/makelib 2012-03-16 11:51:38.000000000 +0100
++++ ossim/makefiles/unx/makelib 2012-03-16 12:13:13.000000000 +0100
+@@ -21,7 +21,7 @@
+
+
+ SHARED_LIB_VERSIONLESS=$(OSSIM_LIB).$(SO_VERSIONLESS_EXT)
+-SHARED_LIB_SONAME=$(OSSIM_LIB).$(SO_SONAME_EXT)
++SHARED_LIB_SONAME=$(OSSIM_LIB).$(SO_REALNAME_EXT)
+ SHARED_LIB_REALNAME=$(OSSIM_LIB).$(SO_REALNAME_EXT)
+ SHARED_LIB_TARGET=$(OSSIM_LIB_PATH)/$(SHARED_LIB_REALNAME)
+ SHARED_OBJ_DIR_PATH=$(BASELIBPATH)/$(SHARED_OBJ_DIR)
+@@ -154,7 +154,7 @@
+
+ define build_shared_lib
+ g++ -shared -Wl,-soname,$(SHARED_LIB_SONAME) -o $(SHARED_LIB_TARGET) $(SHARED_OBJ_DIR_PATH)/*.$(OBJEXT) ; \
+-(cd $(OSSIM_LIB_PATH) ; $(RM_NOPROMPT) $(SHARED_LIB_SONAME) ; $(RM_NOPROMPT) $(SHARED_LIB_VERSIONLESS) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_SONAME) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_VERSIONLESS) ; ) ;
++(cd $(OSSIM_LIB_PATH) ; $(RM_NOPROMPT) $(SHARED_LIB_SONAME) ; $(RM_NOPROMPT) $(SHARED_LIB_VERSIONLESS) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_VERSIONLESS) ; ) ;
+ endef
+
+ else
diff --git a/debian/rules b/debian/rules
index add7f01..3b638d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,7 @@ DEB_CONFIGURE_EXTRA_FLAGS = \
clean::
[ -f Makefile ] || $(MAKE) clean; \
find $(CURRENT) -name Makefile -delete; \
+ find $(CURRENT) -name "*.o" -delete; \
rm -f Makefile.common \
config.status \
include/ossim/ossimConfig.h \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git
More information about the Pkg-grass-devel
mailing list