From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 4 Jan 2011 23:58:45 +0000 (+0100)
Subject: db4: Renamed the package (was db) to be compatible to any later version of db.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c653dca0a2ed6192c6acfe0f7be97569cbb0e65c;p=ipfire-3.x.git

db4: Renamed the package (was db) to be compatible to any later version of db.
---

diff --git a/pkgs/core/db/db.nm b/pkgs/core/db4/db4.nm
similarity index 84%
rename from pkgs/core/db/db.nm
rename to pkgs/core/db4/db4.nm
index 09977d678..195229c9e 100644
--- a/pkgs/core/db/db.nm
+++ b/pkgs/core/db4/db4.nm
@@ -48,12 +48,17 @@ endef
 
 PKG_TARBALL    = $(THISAPP).tar.gz
 
-PKG_PACKAGES   = $(PKG_NAME)-devel $(PKG_NAME)-utils $(PKG_NAME) $(PKG_NAME)-cxx
+PKG_PACKAGES   = $(PKG_NAME_REAL)-devel $(PKG_NAME_REAL)-utils \
+	$(PKG_NAME_REAL) $(PKG_NAME_REAL)-cxx
 
-PKG_FILES                   = /usr/lib/libdb-$(PKG_VER_MAJ).so
-PKG_FILES-$(PKG_NAME)-cxx   = /usr/lib/libdb_cxx-$(PKG_VER_MAJ).so
-PKG_FILES-$(PKG_NAME)-devel = /usr/include /usr/lib
-PKG_FILES-$(PKG_NAME)-utils = /usr/bin
+# 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
+PKG_FILES-$(PKG_NAME_REAL)-utils = /usr/bin
 
 define STAGE_BUILD
 	cd $(DIR_APP)/build_unix && \
diff --git a/pkgs/core/db/patches/db-4.7.25-upstream_fixes-1.patch b/pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch
similarity index 100%
rename from pkgs/core/db/patches/db-4.7.25-upstream_fixes-1.patch
rename to pkgs/core/db4/patches/db-4.7.25-upstream_fixes-1.patch