[apr] 01/01: Revert the libtool change for now

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apr.

commit e8a073cb0018cee464b1683f2b3894aeee74b1e3
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Wed Nov 6 18:44:41 2013 +0100

    Revert the libtool change for now
    
    The libtool shipped with the apr package has no tagged configurations
    and works without --tag parameter. The libtool from the libtool package
    requires --tag, though. Specifying the correct --tag everywhere would be
    a larger enterprise. It would have to include all methods to build
    apache modules written in both C and C++, and all other users of
    apr-config/apu-config.
---
 debian/changelog           |    2 --
 debian/control             |    2 +-
 debian/libapr1-dev.install |   10 +---------
 debian/libapr1-dev.links   |    1 -
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5db7f97..d84dd36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,6 @@ apr (1.4.8-2) UNRELEASED; urgency=low
       Closes: #717231
     - Bump Standards-Version (no additional changes).
   * Support multi-arch.
-  * Depend on libtool instead of shipping a copy in libapr1-dev.
-    Closes: #489625
   * Enable sctp support on Linux.
   * Change apr_rules.mk to not force CFLAGS, etc. to the values used during
     apr's compilation.
diff --git a/debian/control b/debian/control
index 80d6f94..0130c9e 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: Apache Portable Runtime Library
 Package: libapr1-dev
 Architecture: any
 Section: libdevel
-Depends: libapr1 (= ${binary:Version}), uuid-dev, ${misc:Depends}, libtool, libsctp-dev [linux-any]
+Depends: libapr1 (= ${binary:Version}), uuid-dev, ${misc:Depends}, libsctp-dev [linux-any]
 Suggests: python
 Conflicts: libapr1.0-dev, libapr0-dev
 Description: Apache Portable Runtime Library - Development Headers
diff --git a/debian/libapr1-dev.install b/debian/libapr1-dev.install
index 7fcf884..6fec4bf 100644
--- a/debian/libapr1-dev.install
+++ b/debian/libapr1-dev.install
@@ -3,13 +3,5 @@ usr/lib/*/libapr*a
 usr/lib/*/libapr-1.so
 usr/lib/*/pkgconfig
 usr/bin
-usr/share/apr-1.0/build/apr_common.m4
-usr/share/apr-1.0/build/apr_rules.mk
-usr/share/apr-1.0/build/find_apr.m4
-usr/share/apr-1.0/build/gen-build.py
-usr/share/apr-1.0/build/get-version.sh
-usr/share/apr-1.0/build/install.sh
-usr/share/apr-1.0/build/make_exports.awk
-usr/share/apr-1.0/build/make_var_export.awk
-usr/share/apr-1.0/build/mkdir.sh
+usr/share/apr-1.0
 debian/build/docs/dox/html usr/share/doc/libapr1-dev
diff --git a/debian/libapr1-dev.links b/debian/libapr1-dev.links
index 38839e9..7db4ae6 100644
--- a/debian/libapr1-dev.links
+++ b/debian/libapr1-dev.links
@@ -1,3 +1,2 @@
 usr/bin/apr-1-config usr/bin/apr-config
 usr/share/man/man1/apr-1-config.1 usr/share/man/man1/apr-config.1
-usr/bin/libtool usr/share/apr-1.0/build/libtool

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