[SCM] WorldForge protocol library branch, master, updated. upstream/0.6.2-11-gde8fb90

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit de8fb90f93811c6d9f3469b5c657bf411c996777
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Tue Jan 10 11:25:10 2012 -0500

    regenerate autotools at build time to work around rpath

diff --git a/debian/changelog b/debian/changelog
index 4198e49..7246dad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,8 @@ atlas-cpp (0.6.2-1) UNRELEASED; urgency=low
   * new maintainer (Debian games team) (closes: #653950)
   * converted to 3.0 (quilt) source format
   * updated Standards-Version to 3.9.2
-  * worked around use of rpath
   * debian/control: added Vcs- fields
+  * regenerate the autotools at build time to fix rpsth problems
 
  -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Fri, 06 Jan 2012 17:53:32 -0500
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index 68b2013..e71f140 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Stephen M. Webb <stephen.webb at bregmasoft.ca>
 Section: libs
 Priority: optional
-Build-Depends: cdbs, debhelper (>= 5), doxygen
+Build-Depends: cdbs, debhelper (>= 8), doxygen, dh-autoreconf
 Standards-Version: 3.9.2
 Homepage: http://www.worldforge.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/atlas-cpp.git
@@ -43,7 +43,10 @@ Description: World Forge wire protocol library - documentation
 Package: libatlas-cpp-0.6-dev
 Architecture: any
 Section: libdevel
-Depends: libatlas-cpp-0.6-1 (= ${binary:Version}), pkg-config, ${misc:Depends}
+Depends: libatlas-cpp-0.6-1 (= ${binary:Version}),
+         pkg-config,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: libatlas-cpp-0.6-1-dbg (= ${binary:Version}),
           libatlas-cpp-doc (>= ${source:Version})
 Conflicts: libatlas-cpp-0.6-0-dev
diff --git a/debian/libatlas-cpp-0.6-1.install b/debian/libatlas-cpp-0.6-1.install
index be9510b..0c98854 100644
--- a/debian/libatlas-cpp-0.6-1.install
+++ b/debian/libatlas-cpp-0.6-1.install
@@ -1,14 +1,2 @@
-debian/tmp/usr/lib/libAtlas-0.6.so.1 /usr/lib
-debian/tmp/usr/lib/libAtlas-0.6.so.1.0.0 /usr/lib
-debian/tmp/usr/lib/libAtlasCodecs-0.6.so.1 /usr/lib
-debian/tmp/usr/lib/libAtlasCodecs-0.6.so.1.0.0 /usr/lib
-debian/tmp/usr/lib/libAtlasFilters-0.6.so.1 /usr/lib
-debian/tmp/usr/lib/libAtlasFilters-0.6.so.1.0.0 /usr/lib
-debian/tmp/usr/lib/libAtlasFunky-0.6.so.1 /usr/lib
-debian/tmp/usr/lib/libAtlasFunky-0.6.so.1.0.0 /usr/lib
-debian/tmp/usr/lib/libAtlasMessage-0.6.so.1 /usr/lib
-debian/tmp/usr/lib/libAtlasMessage-0.6.so.1.0.0 /usr/lib
-debian/tmp/usr/lib/libAtlasNet-0.6.so.1 /usr/lib
-debian/tmp/usr/lib/libAtlasNet-0.6.so.1.0.0 /usr/lib
-debian/tmp/usr/lib/libAtlasObjects-0.6.so.1 /usr/lib
-debian/tmp/usr/lib/libAtlasObjects-0.6.so.1.0.0 /usr/lib
+usr/lib/lib*-0.6.so.1
+usr/lib/lib*-0.6.so.1.*
diff --git a/debian/libatlas-cpp-0.6-dev.install b/debian/libatlas-cpp-0.6-dev.install
index 456688e..8394dd4 100644
--- a/debian/libatlas-cpp-0.6-dev.install
+++ b/debian/libatlas-cpp-0.6-dev.install
@@ -1,9 +1,4 @@
-debian/tmp/usr/include/Atlas-C++-0.6/Atlas/* usr/include/Atlas-C++-0.6/Atlas
-debian/tmp/usr/lib/libAtlas-0.6.so /usr/lib
-debian/tmp/usr/lib/libAtlasCodecs-0.6.so /usr/lib
-debian/tmp/usr/lib/libAtlasFilters-0.6.so /usr/lib
-debian/tmp/usr/lib/libAtlasFunky-0.6.so /usr/lib
-debian/tmp/usr/lib/libAtlasMessage-0.6.so /usr/lib
-debian/tmp/usr/lib/libAtlasNet-0.6.so /usr/lib
-debian/tmp/usr/lib/libAtlasObjects-0.6.so /usr/lib
-debian/tmp/usr/lib/pkgconfig/atlascpp-0.6.pc /usr/lib/pkgconfig
+usr/bin
+usr/include/Atlas-C++-0.6/Atlas
+usr/lib/lib*-0.6.so
+usr/lib/pkgconfig
diff --git a/debian/rules b/debian/rules
index c0eef32..9aae6d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,19 +2,15 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --enable-debug
+DEB_DH_INSTALL_ARGS = --fail-missing -X.la
+DEB_DH_MAKESHLIBS_ARGS_libatlas-cpp-0.6-1 := -V 'libatlas-cpp-0.6-1'
 
 clean::
 	rm -rf $(CURDIR)/doc/*
 
-# work around ancient broken pre-2004 libtool
-update-config::
-	sed -i -r 's/(hardcode_into_libs)=.*$$/\1=no/' $(CURDIR)/aclocal.m4
-	sed -i -r 's/(hardcode_into_libs)=.*$$/\1=no/' $(CURDIR)/configure
-	sed -i -r 's/(hardcode_into_libs)=.*$$/\1=no/' $(CURDIR)/ltmain.sh
-
 common-binary-indep::
 	doxygen
 
-DEB_DH_MAKESHLIBS_ARGS_libatlas-cpp-0.6-1 := -V 'libatlas-cpp-0.6-1'

-- 
WorldForge protocol library