[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-9-g200b091
Luca Capello
luca at pca.it
Sun May 6 11:38:12 UTC 2012
The following commit has been merged in the master branch:
commit e86e29c989d6f904978b9feabf7c440fbabd9dd2
Author: Jan Hauke Rahm <jhr at debian.org>
Date: Wed Apr 13 11:21:22 2011 +0200
Remove sqlite -> sqlite3 upgrade path (lenny->squeeze)
Closes: #612352
diff --git a/debian/TODO b/debian/TODO
index 939af46..a3a0a26 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,10 +1,3 @@
-POST SQUEEZE:
-
- * Remove old -sqlite (sqlitev2) packages
- * Remove old -sqlite logic in sqlite3 .config, .postinst
- * Remove old -sqlite logic in rules, if any
- * Remove dep on sqlite from bacula-director-sqlite3
-
* Make sure btraceback can be found in /usr/lib/bacula?
* Verify upgrades work as expected
diff --git a/debian/bacula-director-sqlite3.config b/debian/bacula-director-sqlite3.config
index 61ab446..8fcd40d 100644
--- a/debian/bacula-director-sqlite3.config
+++ b/debian/bacula-director-sqlite3.config
@@ -11,17 +11,7 @@ if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
dbc_dbname=bacula.db
dbc_basepath=/var/lib/bacula
. /usr/share/dbconfig-common/dpkg/config.sqlite3
- # Remove the following lines post-squeeze and replace with simple
- #dbc_go bacula-director-sqlite3 $@
- DB="$dbc_basepath/$dbc_dbname"
- if [ -f "$DB" ] && file "$DB" | grep -q "SQLite 2"; then
- # This will be upgraded in postinst. Have to pass fake old
- # version to dbc_go. See comments in bacula-director-sqlite3.postinst
- dbc_go bacula-director-sqlite3 "$1" 2.4.4-1
- else
- echo "config: Running dbc_go bacula-director-sqlite3 $@"
- dbc_go bacula-director-sqlite3 $@
- fi
+ dbc_go bacula-director-sqlite3 $@
fi
set -e
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index 0d251a3..4a0c951 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -31,63 +31,16 @@ dbc_dbfile_owner=bacula:bacula
# set in config, must not be set here: dbc_dbname=bacula.db
# set in config, must not be set here: dbc_basepath=/var/lib/bacula
-# After squeeze, restore this test. This was needed for sqlite2 migration.
-#if [ -n "$2" ]; then
+if [ -n "$2" ]; then
/etc/init.d/bacula-director stop || true
sleep 1
-#fi
-
-
-#### REMOVE THIS CODE POST-SQUEEZE
-CONVERTED_SQLITE2=NO
-
-if [ "$1" = "configure" ] ; then
- DB=/var/lib/bacula/bacula.db
- echo -n " *** Checking type of existing DB at $DB: "
- if [ -f "$DB" ]; then
- if file "$DB" | grep -q "SQLite 2"; then
- echo "SQLite v2"
- echo " *** Converting SQLite2 database to SQLite3 format."
- echo " *** This may take awhile. Please be patient..."
- echo "Converting $DB to temporary location $DB.sqlite3"
- sqlite "$DB" .dump \
- | sed 's/ INTEGER UNSIGNED AUTOINCREMENT,/ INTEGER,/' \
- | sqlite3 "$DB.sqlite3"
- echo "SQLite conversion complete. Cleaning up:"
- echo -n "Renaming: "
- mv -v "$DB" "$DB.old-sqlite2"
- echo -n "Renaming: "
- mv -v "$DB.sqlite3" "$DB"
- chown bacula:bacula "$DB"
- echo " *** Conversion complete. Your sqlite v2 database was left in"
- echo " *** $DB.old-sqlite2. You may delete it at your leisure."
- echo " *** Continuing with upgrade process..."
- CONVERTED_SQLITE2=YES
- else
- echo "SQLite v3"
- fi
- else
- echo "None"
- echo " *** Will create new database at this location."
- fi
fi
-#### END OF CODE TO REMOVE POST-SQUEEZE
# source dbconfig-common shell library, and call the hook function
if [ -f /usr/share/dbconfig-common/dpkg/config.sqlite3 ]; then
. /usr/share/dbconfig-common/dpkg/postinst.sqlite3
- #### POST-SQUEEZE, REMOVE THE FOLLOWING LINES AND SIMPLY USE:
- # dbc_go bacula-director-sqlite3 $@
- if [ "$1" = "configure" -a "$CONVERTED_SQLITE2" = "YES" ]; then
- # If we converted from Sqlite v2 in this run, then we have to
- # pass a fake prior version number to dbc_go. Otherwise, it
- # would think that this is a new sqlite3 install and not upgrade
- # the database.
- dbc_go bacula-director-sqlite3 configure 2.4.4-1
- else
- dbc_go bacula-director-sqlite3 $@
- fi
+ dbc_go bacula-director-sqlite3 $@
fi
LOGDIR="/var/log/bacula"
diff --git a/debian/control b/debian/control
index 53d0388..1ed36d5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Bacula packaging Group <pkg-bacula-devel at lists.alioth.debian.
Uploaders: Jan Hauke Rahm <jhr at debian.org>
Build-Depends: autotools-dev, debhelper (>= 6.0.7~), po-debconf (>= 0.8.2),
zlib1g-dev, libreadline-dev, libjconv-dev,
- libsqlite0-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 9.1),
+ libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 9.1),
postgresql-server-dev-all,
libwrap0-dev, python-dev, libgtk2.0-dev (>= 2.10),
libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev,
@@ -98,24 +98,10 @@ Description: network backup, recovery and verification - Director common files
.
This package provides common files for the Bacula Director daemon.
-Package: bacula-director-sqlite
-Depends: bacula-director-sqlite3 (>= ${binary:Version}), sqlite3, sqlite, ${shlibs:Depends}, ${misc:Depends}
-Architecture: all
-Description: network backup, recovery and verification - SQLite 2 director transition
- This package exists to upload pre-3.0 Bacula SQLite v2 installations to
- SQLite v3 with Bacula 3.0. The SQLite v2 support has been deprecated
- in Bacula 3.0, and this package will get you migrated to Bacula 3.0.
- .
- Once you are successfully migrated, you can safely delete this package.
- .
- This package does nothing for people that aren't upgrading.
-
Package: bacula-director-sqlite3
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), sqlite3, sqlite, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common (>= 1.8.19), ${misc:Depends}
-# Can remove dep on file once sqlite2 migration code is dropped from postinst
-# after squeeze (that migration code is for lenny -> squeeze)
+Depends: bacula-director-common (= ${binary:Version}), sqlite3, ${shlibs:Depends}, bacula-common-sqlite3 (>= ${binary:Version}), file, dbconfig-common (>= 1.8.19), ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
@@ -241,16 +227,6 @@ Description: network backup, recovery and verification - SQLite 3 SD tools
This package contains SQLite 3 versions of the bscan and bcopy utilities,
which are used for recovery when Bacula's catalog is unavailable.
-Package: bacula-sd-sqlite
-Architecture: any
-Depends: bacula-sd (= ${binary:Version}), bacula-sd-sqlite3 (>= 3.0.0), ${misc:Depends}
-Conflicts: bacula-sd (<< 1.38.9)
-Replaces: bacula-sd (<< 1.38.9)
-Description: network backup, recovery and verification - SQLite SD tools
- This is a transition package. SQLite v2 support has been deprecated
- as of Bacula 3.0.0. This package depends on the SQLite v3 version of the
- storage daemon.
-
Package: bacula-sd-mysql
Architecture: any
Depends: bacula-sd (= ${binary:Version}), ${shlibs:Depends}, bacula-common-mysql (>= ${binary:Version}), ${misc:Depends}
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list