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

sebastic pushed a commit to branch master
in repository libterralib.

commit 529468e020308cdbccc9b74c8f8ebf9a13cf44dd
Author: Alastair McKinstry <mckins...@debian.org>
Date:   Thu Sep 1 14:22:45 2011 +0100

    Imported Debian patch 4.0.0-3
---
 debian/changelog                |  7 +++++++
 debian/compat                   |  2 +-
 debian/control                  |  5 ++++-
 debian/libterralib-dev.dirs     |  1 -
 debian/libterralib-dev.install  |  7 -------
 debian/libterralib.install      |  3 ---
 debian/patches/geotiff.patch    |  4 ++--
 debian/patches/pkg-config.patch | 10 +++++-----
 debian/rules                    | 20 +++++++++++++++++++-
 debian/shlibs.libterralib3.old  |  3 ---
 10 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2e5266..fa3e7b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libterralib (4.0.0-3) unstable; urgency=low
+
+  * Ensure libterralib is linked against libtiff. Include libtiff-dev B-D.
+  * Multi-Arch support.
+
+ -- Alastair McKinstry <mckins...@debian.org>  Thu, 01 Sep 2011 14:22:45 +0100
+
 libterralib (4.0.0-2) unstable; urgency=low
 
   * Need to depend on qt4-qmake, not just qt4-dev-tools. Closes: #632759 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f98dac6..6ca7bd6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian GIS Team <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Petter Reinholdtsen <p...@debian.org>, Alastair McKinstry 
<mckins...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), qt4-dev-tools, libgeotiff-dev, 
zlib1g-dev, libjpeg-dev | libjpeg8-dev, python-all-dev, qt4-qmake
+Build-Depends: debhelper (>= 8.1.3~), qt4-dev-tools, libgeotiff-dev, 
zlib1g-dev, libjpeg-dev | libjpeg8-dev, python-all-dev, qt4-qmake, libtiff-dev 
| libtiff4-dev
 Homepage: http://www.terralib.org/
 Vcs-Svn: https://svn.dpi.inpe.br/terralib/tags/v-4-0-0/src
 Standards-Version: 3.9.2
@@ -11,6 +11,7 @@ Standards-Version: 3.9.2
 Package: libterralib-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, libterralib (= ${binary:Version})
 Suggests: libterralib-doc (= ${binary:Version})
 Conflicts: libterralib1-dev, libterralib3-dev
@@ -30,7 +31,9 @@ Description: C++ library for Geographical Information Systems 
-- development pac
 
 Package: libterralib
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Suggests: libterralib-doc (= ${binary:Version})
 Conflicts: libterralib1c2a, libterralib3
 Replaces: libterralib1c2a, libterralib3
diff --git a/debian/libterralib-dev.dirs b/debian/libterralib-dev.dirs
index f32702f..f649f9c 100644
--- a/debian/libterralib-dev.dirs
+++ b/debian/libterralib-dev.dirs
@@ -5,4 +5,3 @@ usr/include/terralib/drivers/
 usr/include/terralib/functions/
 usr/include/terralib/kernel/
 usr/include/terralib/stat/
-usr/lib/pkgconfig
diff --git a/debian/libterralib-dev.install b/debian/libterralib-dev.install
index 7f99e06..dd5e832 100644
--- a/debian/libterralib-dev.install
+++ b/debian/libterralib-dev.install
@@ -2,10 +2,3 @@ src/terralib/dtm/*.h usr/include/terralib/dtm
 src/terralib/functions/*.h usr/include/terralib/functions
 src/terralib/kernel/*.h usr/include/terralib/kernel
 src/terralib/stat/*.h usr/include/terralib/stat
-libterralib.a usr/lib
-libte_utils.a  usr/lib
-libte_functions.a      usr/lib
-Release/linux-g++/libterralib.so       usr/lib
-Release/linux-g++/libte_utils.so       usr/lib
-Release/linux-g++/libte_functions.so   usr/lib
-libterralib.pc usr/lib/pkgconfig
diff --git a/debian/libterralib.install b/debian/libterralib.install
deleted file mode 100644
index 0242a0d..0000000
--- a/debian/libterralib.install
+++ /dev/null
@@ -1,3 +0,0 @@
-Release/linux-g++/libterralib.so.* usr/lib
-Release/linux-g++/libte_utils.so.* usr/lib
-Release/linux-g++/libte_functions.so.* usr/lib
diff --git a/debian/patches/geotiff.patch b/debian/patches/geotiff.patch
index 42dfa0e..88d013d 100644
--- a/debian/patches/geotiff.patch
+++ b/debian/patches/geotiff.patch
@@ -1,6 +1,6 @@
 Description: Link against Debian system geotiff, rather than our own version. 
Don't build unnecessary packages.
 Author: Alastair McKinstry <mckins...@debian.org>
-Last-Updated: 2011-06-15
+Last-Updated: 2011-09-01
 Forwarded: no
 
 Index: TerraLib_linux_v_4_0_0/build/qt4/terralib.pro
@@ -28,7 +28,7 @@ Index: TerraLib_linux_v_4_0_0/build/qt4/terralib/terralib.pro
  }
  unix:LIBS += -lpthread -lz
 -LIBS += -ljpeg -lterralibtiff
-+LIBS += -ljpeg -lgeotiff
++LIBS += -ljpeg -lgeotiff -ltiff
  INCLUDEPATH   = $${TEKERNELPATH} \
          $${TESRCPATH}/functions \
          $${TESRCPATH}/utils \
diff --git a/debian/patches/pkg-config.patch b/debian/patches/pkg-config.patch
index 8340ab1..ab5b9cb 100644
--- a/debian/patches/pkg-config.patch
+++ b/debian/patches/pkg-config.patch
@@ -1,6 +1,6 @@
 Description: Add pkg-config file for terralib.
 Author: Alastair McKinstry <mckins...@debian.org>
-Last-Updated: 2011-06-15
+Last-Updated: 2011-09-01
 Forwarded: no
 
 diff -Nur -x '*.orig' -x '*~' libterralib/libterralib.pc 
libterralib.new/libterralib.pc
@@ -9,7 +9,7 @@ diff -Nur -x '*.orig' -x '*~' libterralib/libterralib.pc 
libterralib.new/libterr
 @@ -0,0 +1,11 @@
 +prefix=/usr
 +exec_prefix=${prefix}
-+libdir=/usr/lib
++libdir=/usr/lib/@DEB_HOST_MULTIARCH@
 +includedir=${prefix}/include/terralib
 +
 +Name: libterralib
@@ -17,14 +17,14 @@ diff -Nur -x '*.orig' -x '*~' libterralib/libterralib.pc 
libterralib.new/libterr
 +Version: 4.4.0
 +Libs: -L${libdir} -lterralib
 +Cflags: -I${includedir}/terralib
-+Libs.private: -lz -ljpeg -ltiff -lpthread -lproj -lgeotiff
++Libs.private: -lz -ljpeg  -lpthread -lproj -lgeotiff -ltiff
 diff -Nur -x '*.orig' -x '*~' libterralib/libterralib.pc.in 
libterralib.new/libterralib.pc.in
 --- libterralib/libterralib.pc.in      1970-01-01 01:00:00.000000000 +0100
 +++ libterralib.new/libterralib.pc.in  2009-08-10 12:43:14.000000000 +0100
 @@ -0,0 +1,11 @@
 +prefix=@PREFIX@
 +exec_prefix=${prefix}
-+libdir=/usr/lib
++libdir=/usr/lib/@DEB_HOST_MULTIARCH@
 +includedir=${prefix}/include/terralib
 +
 +Name: libterralib
@@ -32,4 +32,4 @@ diff -Nur -x '*.orig' -x '*~' libterralib/libterralib.pc.in 
libterralib.new/libt
 +Version: @VERSION@
 +Libs: -L${libdir} -lterralib
 +Cflags: -I${includedir}/terralib
-+Libs.private: -lz -ljpeg -ltiff -lpthread -lproj -lgeotiff
++Libs.private: -lz -ljpeg  -lpthread -lproj -lgeotiff -ltiff
diff --git a/debian/rules b/debian/rules
index 60e85ae..408fa64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,13 @@
 
 # The magic debhelper rule
 %:
-       dh --with-python2 $@
+       dh $@ --with-python2 
 
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 override_dh_auto_build:
        find examples -type f -exec chmod 644 {} \;
        cd build/qt4/terralib && qmake QMAKE_CXXFLAGS=-fpermissive terralib.pro 
 && $(MAKE) 
@@ -17,6 +19,22 @@ override_dh_auto_build:
        ar rcs libte_functions.a Release/linux-g++/obj/te_functions/*.o
        ar rcs libte_utils.a Release/linux-g++/obj/te_utils/*.o
 
+override_dh_auto_install:
+       dh_install
+       # Install into Multarch directories
+       dh_install -p libterralib Release/linux-g++/libterralib.so.* 
usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib Release/linux-g++/libte_utils.so.* 
usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib Release/linux-g++/libte_functions.so.*        
 usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib-dev libterralib.a 
usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib-dev libte_utils.a   
usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib-dev libte_functions.a    
usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib-dev Release/linux-g++/libterralib.so        
usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib-dev Release/linux-g++/libte_utils.so        
usr/lib/$(DEB_HOST_MULTIARCH)
+       dh_install -p libterralib-dev Release/linux-g++/libte_functions.so    
usr/lib/$(DEB_HOST_MULTIARCH)
+       # nasty hack.
+       mkdir -p debian/libterralib-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
+       sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/' <  
libterralib.pc >  
debian/libterralib-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libterralib.pc
+
 override_dh_clean:
        dh_clean
        rm -f lib*.a
diff --git a/debian/shlibs.libterralib3.old b/debian/shlibs.libterralib3.old
deleted file mode 100644
index b01820b..0000000
--- a/debian/shlibs.libterralib3.old
+++ /dev/null
@@ -1,3 +0,0 @@
-libterralib 1 libterralib3
-libte_utils 1 libterralib3
-libte_utils 1 libterralib1c2a

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/libterralib.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

Reply via email to