This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch master
in repository ossim.
commit b637bd286d9133b1c8d50623aabf059214e79be9
Merge: 1755d9a b488e27
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Mon Mar 19 10:37:14 2012 +0100
Merge branch '1.7.21' into HEAD
Conflicts:
debian/changelog
debian/control
debian/changelog | 8 ++++
debian/control | 2 +-
debian/patches/jpeg.patch | 114 ++++++++++++++++++++++++++++++++++++++++++++++
debian/rules | 4 +-
4 files changed, 125 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index 2aae8e1,34fb052..a671442
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
-ossim (1.7.21-3) unstable; urgency=low
++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 <fran...@debian.org> Mon, 19 Mar 2012 09:57:41
+0100
+
+ossim (1.7.21-3) unstable; urgency=low
+
+ * Truly fixed dependency on virtual package libcurl4-dev.
+ (closes: #618152)
+
+ -- Francesco Paolo Lovergine <fran...@debian.org> Tue, 24 May 2011 14:29:26
+0200
+
ossim (1.7.21-2) unstable; urgency=low
* Moved to libcurl4-gnutls-dev build-dep.
diff --cc debian/control
index 186c23e,4e3aa1a..435aa7d
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,8 +3,8 @@@ Section: scienc
Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>
- Build-Depends: cdbs, debhelper (>= 7), libopenscenegraph-dev, libzzip-dev,
zlib1g-dev, libtiff4-dev,
+ Build-Depends: cdbs, debhelper (>= 7), libopenscenegraph-dev, libzzip-dev,
zlib1g-dev, libtiff5-dev,
- libjpeg-dev, libexpat1-dev, libcurl4-gnutls-dev,libcurl4-dev, libpng12-dev,
libgif-dev, libgeotiff-dev, quilt, libopenthreads-dev,
+ libjpeg-dev, libexpat1-dev, libcurl4-gnutls-dev|libcurl4-dev, libpng12-dev,
libgif-dev, libgeotiff-dev, quilt, libopenthreads-dev,
libtar-dev, libfreetype6-dev
Standards-Version: 3.9.2
Homepage: http://www.ossim.org/
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/ossim.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
