[ossim] 03/07: Removed old patches and fixed soname versioning.
Francesco Lovergine
frankie at moszumanska.debian.org
Fri Mar 7 17:15:13 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 71356487fc09675b7ce45b9c6d31d4fba42faf5c
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Thu Mar 6 15:24:12 2014 +0100
Removed old patches and fixed soname versioning.
---
debian/changelog | 1 +
debian/patches/cmake | 2 +-
debian/patches/jpeg | 111 ------------------------------------------------
debian/patches/kfreebsd | 22 ----------
debian/patches/series | 3 --
debian/patches/soname | 77 ---------------------------------
6 files changed, 2 insertions(+), 214 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0a65f5c..74e41e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ossim (1.8.16-1) unstable; urgency=low
* Fixed for libpng-dev b-d.
(closes: #662460)
* Removed cdbs use, now using modern dh_* methods.
+ * Removed obsoleted patches.
-- Francesco Paolo Lovergine <frankie at debian.org> Tue, 04 Mar 2014 17:23:02 +0100
diff --git a/debian/patches/cmake b/debian/patches/cmake
index 8e5ef24..8994bf7 100644
--- a/debian/patches/cmake
+++ b/debian/patches/cmake
@@ -3207,7 +3207,7 @@ Index: ossim/CMakeModules/OssimVersion.cmake
@@ -0,0 +1,6 @@
+SET(OSSIM_MAJOR_VERSION_NUMBER "1")
+SET(OSSIM_MINOR_VERSION_NUMBER "8")
-+SET(OSSIM_PATCH_VERSION_NUMBER "18")
++SET(OSSIM_PATCH_VERSION_NUMBER "16")
+SET(OSSIM_RELEASE_NUMBER "1")
+SET(OSSIM_VERSION "${OSSIM_MAJOR_VERSION_NUMBER}.${OSSIM_MINOR_VERSION_NUMBER}.${OSSIM_PATCH_VERSION_NUMBER}" )
+SET(OSSIM_SOVERSION "${OSSIM_MAJOR_VERSION_NUMBER}" )
diff --git a/debian/patches/jpeg b/debian/patches/jpeg
deleted file mode 100644
index 9a2777a..0000000
--- a/debian/patches/jpeg
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: ossim/configure
-===================================================================
---- ossim.orig/configure 2012-03-12 13:00:32.000000000 +0100
-+++ ossim/configure 2012-03-12 13:43:05.000000000 +0100
-@@ -7609,102 +7609,13 @@
- fi
-
-
-- JPEG_TOP=
- JPEG_INCLUDE_PATH=
- JPEG_LIB_PATH=
-- JPEG_LIBS=
-+ JPEG_LIBS=-ljpeg
-
-- if test "$with_jpeg" = "no" ; then
-- echo "ERROR: no is not an option as jpeg is required!"
-- { { $as_echo "$as_me:$LINENO: error: jpeg support required!" >&5
--$as_echo "$as_me: error: jpeg support required!" >&2;}
-- { (exit 1); exit 1; }; }
-- elif test "$with_jpeg" = "" ; then
-- if test -f "$OSSIM_TOP/../jpeg/jpeglib.h" ; then
-- JPEG_TOP="$OSSIM_TOP/../jpeg"
-- elif test -f "$OSSIM_TOP/../jpeg-8a/jpeglib.h" ; then
-- JPEG_TOP="$OSSIM_TOP/../jpeg-8a"
-- elif test -f "$OSSIM_TOP/../jpeg-6b/jpeglib.h" ; then
-- JPEG_TOP="$OSSIM_TOP/../jpeg-6b"
-- elif test -f "/usr/include/jpeglib.h" ; then
-- JPEG_TOP="/usr"
-- elif test -f "/usr/local/include/jpeglib.h" ; then
-- JPEG_TOP="/usr/local"
-- elif test -f "/opt/local/include/jpeglib.h" ; then
-- JPEG_TOP="/opt/local"
-- elif test -f "/sw/include/jpeglib.h" ; then
-- JPEG_TOP="/sw"
-- else
-- echo "ERROR: JPEG_TOP not found!"
-- { { $as_echo "$as_me:$LINENO: error: jpeg support required!" >&5
--$as_echo "$as_me: error: jpeg support required!" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- else
-- JPEG_TOP=$with_jpeg
-- fi
--
-- echo "JPEG_TOP: $JPEG_TOP"
--
-- if test -d "$JPEG_TOP" ; then
-- if test -f "$JPEG_TOP/include/jpeglib.h" ; then
-- JPEG_INCLUDE_PATH="-I$JPEG_TOP/include"
-- elif test -f "$JPEG_TOP/jpeglib.h" ; then
-- JPEG_INCLUDE_PATH="-I$JPEG_TOP"
-- else
-- echo "ERROR: jpeglib.h not found!"
-- { { $as_echo "$as_me:$LINENO: error: jpeg support required!" >&5
--$as_echo "$as_me: error: jpeg support required!" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
--
-- if test "$JPEG_INCLUDE_PATH" = "-I/usr/include" ; then
-- JPEG_INCLUDE_PATH=""
-- fi
--
-- if test -f "$JPEG_TOP/lib/libjpeg.a" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP/lib"
-- elif test -f "$JPEG_TOP/lib/libjpeg.dll.a" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP/lib"
-- elif test -f "$JPEG_TOP/lib/libjpeg.lib" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP/lib"
-- elif test -f "$JPEG_TOP/lib64/libjpeg.a" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP/lib64"
-- elif test -f "$JPEG_TOP/lib/libjpeg.so" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP/lib"
-- elif test -f "$JPEG_TOP/.libs/libjpeg.so" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP/lib"
-- elif test -f "$JPEG_TOP/libjpeg.a" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP"
-- elif test -f "$JPEG_TOP/libjpeg.lib" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP"
-- elif test -f "$JPEG_TOP/libjpeg.so" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP"
-- elif test -f "$JPEG_TOP/lib64/libjpeg.so" ; then
-- JPEG_LIB_PATH="-L$JPEG_TOP/lib64"
-- else
-- echo "ERROR: libjpeg not found!"
-- { { $as_echo "$as_me:$LINENO: error: jpeg support required!" >&5
--$as_echo "$as_me: error: jpeg support required!" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- JPEG_LIBS=-ljpeg
--
-- if test "$JPEG_LIB_PATH" = "-L/usr/lib" ; then
-- JPEG_LIB_PATH=""
-- elif test "$JPEG_LIB_PATH" = "-L/usr/lib64" ; then
-- JPEG_LIB_PATH=""
-- fi
--
-- echo "JPEG_INCLUDE_PATH = $JPEG_INCLUDE_PATH"
-- echo "JPEG_LIB_PATH = $JPEG_LIB_PATH"
-- echo "JPEG_LIBS = $JPEG_LIBS"
-- else
-- echo "JPEG_TOP not determined!"
-- { { $as_echo "$as_me:$LINENO: error: jpeg support required!" >&5
--$as_echo "$as_me: error: jpeg support required!" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-+ echo "JPEG_INCLUDE_PATH = $JPEG_INCLUDE_PATH"
-+ echo "JPEG_LIB_PATH = $JPEG_LIB_PATH"
-+ echo "JPEG_LIBS = $JPEG_LIBS"
-
- JPEG_INCLUDE_PATH=$JPEG_INCLUDE_PATH
-
diff --git a/debian/patches/kfreebsd b/debian/patches/kfreebsd
deleted file mode 100644
index 4ce10d7..0000000
--- a/debian/patches/kfreebsd
+++ /dev/null
@@ -1,22 +0,0 @@
-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 c1c65dc..a3ea3e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-jpeg
-soname
-kfreebsd
cmake
diff --git a/debian/patches/soname b/debian/patches/soname
deleted file mode 100644
index 1658ccf..0000000
--- a/debian/patches/soname
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: ossim/configure
-===================================================================
---- ossim.orig/configure 2012-03-16 12:56:56.000000000 +0100
-+++ ossim/configure 2012-03-16 12:56:56.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.16'
-+PACKAGE_STRING='ossim 1.8.16'
- 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=16
-
-
- 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:56:46.000000000 +0100
-+++ ossim/makefiles/unx/makelibcore 2012-03-16 12:57:51.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_VERSIONLESS) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_VERSIONLESS) ; ) ;
- endef
-
- else
-Index: ossim/makefiles/unx/makelib
-===================================================================
---- ossim.orig/makefiles/unx/makelib 2012-03-16 12:56:46.000000000 +0100
-+++ ossim/makefiles/unx/makelib 2012-03-16 12:58:10.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_VERSIONLESS) ; ln -s $(SHARED_LIB_REALNAME) $(SHARED_LIB_VERSIONLESS) ; ) ;
- endef
-
- else
--
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