[ossim] 11/25: Merge branch '1.7.21'

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository ossim.

commit 57a3550559f63542295c26d816111a3ac240b077
Merge: d9d2c8a 32956cc
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Mar 19 14:33:55 2012 +0100

    Merge branch '1.7.21'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/patches/jpeg
    	debian/patches/series
    	debian/rules

 debian/changelog | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 7b0dbc2,a671442..c7cde2e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,10 +1,32 @@@
 +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. 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)
++  * Merged with 1.7.21-4 latest update. 
++
++ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 19 Mar 2012 14:27:41 +0100
++
+ ossim (1.7.21-4) unstable; urgency=low
+ 
+   * Backport from 1.8 branch: fixig jpeg detection.
+     (closes: #640819)
+   * Now using TIFF 4 for better compatibility.
  
-  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 15 Mar 2012 18:01:08 +0100
+  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 19 Mar 2012 09:57:41 +0100
  
  ossim (1.7.21-3) unstable; urgency=low
  

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