summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeve Jelbert2010-01-30 18:22:05 +0100
committerTreeve Jelbert2010-01-30 18:22:05 +0100
commit26c3af30b4ee859378b01f99f3c6f7e6984d474d (patch)
tree7c06d9df0f7ccc6aa9dcc81042dc624cb9d0d9f2
parent67d168000f6baed9c8cc62a3f87d4aae68169500 (diff)
firebird - remove fb2.5 stuff
-rwxr-xr-xdatabase/firebird/CONFLICTS1
-rwxr-xr-xdatabase/firebird/DETAILS6
-rw-r--r--database/firebird/HISTORY3
-rwxr-xr-xdatabase/firebird/PREPARE8
-rw-r--r--database/firebird/fb2.5.patch.bz2bin3933 -> 0 bytes
5 files changed, 5 insertions, 13 deletions
diff --git a/database/firebird/CONFLICTS b/database/firebird/CONFLICTS
new file mode 100755
index 0000000000..3fab6ef661
--- /dev/null
+++ b/database/firebird/CONFLICTS
@@ -0,0 +1 @@
+conflicts firebird25
diff --git a/database/firebird/DETAILS b/database/firebird/DETAILS
index b73c17ec54..b6a1206203 100755
--- a/database/firebird/DETAILS
+++ b/database/firebird/DETAILS
@@ -1,11 +1,5 @@
SPELL=firebird
case $FB_VER in
- 2.5)
- VERSION=2.5.0.25784-ReleaseCandidate1
- SOURCE_HASH=sha512:7227b39cd73477dc50123999f819b52cdaaf19a37bc583bae77b4ae68743a7fff51b67eebab28e4faa8ba15af47e9560b94d5284fac639ac74e882879f652fd0
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/f/F}-${VERSION/-0\.RC?/}
- SECURITY_PATCH=1
-;;
2.0)
VERSION=2.0.5.13206-0
SOURCE_HASH=sha512:8b463631e8708f2e28d7088f9f9d25cda270f924c650d6d4d231c721ef1e4ff5456975ec207ae874a19b00c4e8b273243311d2383551539479ab0d6da04ccd78
diff --git a/database/firebird/HISTORY b/database/firebird/HISTORY
index db38f70644..3f0600fac1 100644
--- a/database/firebird/HISTORY
+++ b/database/firebird/HISTORY
@@ -1,5 +1,8 @@
2010-01-30 Treeve Jelbert <treeve@sourcemage.org>
* PROVIDES: add FIREBIRD
+ * CONFLICTS: added
+ * PREPARE, DETAILS, BUILD: remove fb2.5 support - now a separate spell
+ * fb2.5.patch.bz2: deleted
2009-11-28 Treeve Jelbert <treeve@sourcemage.org>
* init.d/firebird2: fic typo
diff --git a/database/firebird/PREPARE b/database/firebird/PREPARE
index b610bb67b1..3909b511dc 100755
--- a/database/firebird/PREPARE
+++ b/database/firebird/PREPARE
@@ -7,7 +7,7 @@ cat <<EOF
After installing firebird, you should change the default password for the SYSDBA user
by means of the script /usr/firebird/bin/changeDBAPassword.sh
EOF
-config_query_list FB_VER "which version to build?" 2.1 2.0 2.5
+config_query_list FB_VER "which version to build?" 2.1 2.0
# warn of major changes
if spell_ok firebird;then
@@ -38,12 +38,6 @@ EOF
/usr/firebird/upgrade/metadata_charset.txt
EOF
;;
- 2.5)
- cat <<EOF
- Firebird 2.5 includes ODS 11.2 changes. Very experimental!
- You are recommended to back up you firebird installation and databases
-EOF
- ;;
esac
if ! query "do you really want to upgrade firebird?";then
return 1
diff --git a/database/firebird/fb2.5.patch.bz2 b/database/firebird/fb2.5.patch.bz2
deleted file mode 100644
index db885b42bc..0000000000
--- a/database/firebird/fb2.5.patch.bz2
+++ /dev/null
Binary files differ