From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 5 Jan 2011 01:10:30 +0000 (+0100)
Subject: Make renaming complete for db package.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea11fef92f2d78f60f64700d047bd3e90940db4;p=ipfire-3.x.git

Make renaming complete for db package.
---

diff --git a/pkgs/core/bind/bind.nm b/pkgs/core/bind/bind.nm
index b5ca8f3a5..9041e9e9e 100644
--- a/pkgs/core/bind/bind.nm
+++ b/pkgs/core/bind/bind.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.isc.org/products/BIND/
 PKG_LICENSE    = Proprietary
 PKG_SUMMARY    = BIND provides tools for the DNS.
 
-PKG_BUILD_DEPS+= db-devel openssl-devel
+PKG_BUILD_DEPS+= db4-devel openssl-devel
 
 define PKG_DESCRIPTION
 	BIND (Berkeley Internet Name Domain or named) is the most commonly used \
diff --git a/pkgs/core/cyrus-sasl/cyrus-sasl.nm b/pkgs/core/cyrus-sasl/cyrus-sasl.nm
index 1bdc1fab8..7d8af2c1f 100644
--- a/pkgs/core/cyrus-sasl/cyrus-sasl.nm
+++ b/pkgs/core/cyrus-sasl/cyrus-sasl.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://asg.web.cmu.edu/sasl/sasl-library.html
 PKG_LICENSE    = BSD
 PKG_SUMMARY    = The Cyrus SASL library.
 
-PKG_BUILD_DEPS+= db-devel openssl-devel pam-devel
+PKG_BUILD_DEPS+= db4-devel openssl-devel pam-devel
 
 define PKG_DESCRIPTION
 	The cyrus-sasl package contains the Cyrus implementation of SASL. \
diff --git a/pkgs/core/db4/db4.nm b/pkgs/core/db4/db4.nm
index 195229c9e..87a6c117b 100644
--- a/pkgs/core/db4/db4.nm
+++ b/pkgs/core/db4/db4.nm
@@ -51,10 +51,6 @@ PKG_TARBALL    = $(THISAPP).tar.gz
 PKG_PACKAGES   = $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-utils \
 	$(PKG_NAME_REAL) $(PKG_NAME_REAL)-cxx
 
-# Add a shortcut to be compatible to older versions of this package.
-# At some time this will only be called db4-devel.
-PKG_PROVIDES-$(PKG_NAME_REAL)-devel += db-devel
-
 PKG_FILES                        = /usr/lib/libdb-$(PKG_VER_MAJ).so
 PKG_FILES-$(PKG_NAME_REAL)-cxx   = /usr/lib/libdb_cxx-$(PKG_VER_MAJ).so
 PKG_FILES-$(PKG_NAME_REAL)-devel = /usr/include /usr/lib
diff --git a/pkgs/core/iproute2/iproute2.nm b/pkgs/core/iproute2/iproute2.nm
index 1d5ef6c6f..9419ba529 100644
--- a/pkgs/core/iproute2/iproute2.nm
+++ b/pkgs/core/iproute2/iproute2.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.linuxfoundation.org/en/Net:Iproute2
 PKG_LICENSE    = GPLv2+
 PKG_SUMMARY    = Advanced IP routing and network device configuration tools.
 
-PKG_BUILD_DEPS+= bison db-devel flex
+PKG_BUILD_DEPS+= bison db4-devel flex
 
 define PKG_DESCRIPTION
 	The iproute package contains networking utilities (ip and rtmon, for \
diff --git a/pkgs/core/man-db/man-db.nm b/pkgs/core/man-db/man-db.nm
index c092f450d..59a2459cb 100644
--- a/pkgs/core/man-db/man-db.nm
+++ b/pkgs/core/man-db/man-db.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://bzr.savannah.gnu.org/r/man-db/
 PKG_LICENSE    = GPL
 PKG_SUMMARY    = man-db is an on-line manual database.
 
-PKG_BUILD_DEPS+= db-devel groff
+PKG_BUILD_DEPS+= db4-devel groff
 PKG_DEPS      += groff less
 
 define PKG_DESCRIPTION
diff --git a/pkgs/core/openldap/openldap.nm b/pkgs/core/openldap/openldap.nm
index b6408f0e2..ce03d8f70 100644
--- a/pkgs/core/openldap/openldap.nm
+++ b/pkgs/core/openldap/openldap.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.openldap.org/
 PKG_LICENSE    = OpenLDAP
 PKG_SUMMARY    = LDAP support libraries.
 
-PKG_BUILD_DEPS+= db-devel cyrus-sasl-devel groff libtool libtool-devel \
+PKG_BUILD_DEPS+= db4-devel cyrus-sasl-devel groff libtool libtool-devel \
 	openssl-devel pth-devel
 
 define PKG_DESCRIPTION
diff --git a/pkgs/core/perl/perl.nm b/pkgs/core/perl/perl.nm
index c1325847b..c64b8264f 100644
--- a/pkgs/core/perl/perl.nm
+++ b/pkgs/core/perl/perl.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.perl.org/
 PKG_LICENSE    = GPL+ or Artistic and GPLv2+ or Artistic
 PKG_SUMMARY    = Practical Extraction and Report Language.
 
-PKG_BUILD_DEPS+= db-devel gcc-c++ gdbm-devel iana-etc perl procps zlib-devel
+PKG_BUILD_DEPS+= db4-devel gcc-c++ gdbm-devel iana-etc perl procps zlib-devel
 
 define PKG_DESCRIPTION
 	Perl is a high-level programming language with roots in C, sed, awk \
diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm
index c8374e5dd..77028b73b 100644
--- a/pkgs/core/python/python.nm
+++ b/pkgs/core/python/python.nm
@@ -34,7 +34,7 @@ PKG_URL        = http://www.python.org
 PKG_LICENSE    = Python
 PKG_SUMMARY    = An interpreted, interactive, object-oriented programming language.
 
-PKG_BUILD_DEPS+= autoconf automake bzip2-devel db-devel expat-devel gdbm-devel \
+PKG_BUILD_DEPS+= autoconf automake bzip2-devel db4-devel expat-devel gdbm-devel \
 	libffi-devel libselinux-devel ncurses-devel openssl-devel pkg-config \
 	readline-devel sqlite-devel tar zlib-devel