[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.0.3-1-59-g960e5ed
Alexander Golovko
alexandro at ankalagon.ru
Sun May 20 14:56:44 UTC 2012
The following commit has been merged in the master branch:
commit 960e5edb090fe04ed070b956bf809f5e602685c5
Merge: bdacedcad13d08348849606407baff9980d6e066 97a548c25e8bc3345dc3ee7afc824dd72c98b95d
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date: Sun May 20 18:35:06 2012 +0400
Merge commit '97a548c'
d71e346 - applied
621a064 - applied
21014db - rejected (i can sucessfully build packages without procps)
97a548c - applied
+ updated changelog
diff --combined debian/bacula-common.install
index e412d72,9425e8e..1d9f3ab
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@@ -1,15 -1,9 +1,15 @@@
etc/bacula/scripts/btraceback.gdb
- usr/lib/bacula/libbaccfg*
- usr/lib/bacula/libbacfind*
- usr/lib/bacula/libbac.*
- usr/lib/bacula/libbac-*
- usr/lib/bacula/libbacpy*
+ usr/lib/bacula/libbaccfg*.so
+ usr/lib/bacula/libbacfind*.so
+ usr/lib/bacula/libbac.so
+ usr/lib/bacula/libbac-*.so
+ usr/lib/bacula/libbacpy*.so
usr/sbin/btraceback usr/lib/bacula
usr/sbin/bsmtp usr/lib/bacula
debian/common-functions usr/share/bacula-common
+etc/bacula/tray-monitor.conf usr/share/bacula-common/defconfig
+etc/bacula/bat.conf usr/share/bacula-common/defconfig
+etc/bacula/bconsole.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-sd.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-fd.conf usr/share/bacula-common/defconfig
+etc/bacula/bacula-dir.conf usr/share/bacula-common/defconfig
diff --combined debian/changelog
index a3129e2,9891987..ddf6d4c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,67 -1,3 +1,70 @@@
+bacula (5.0.3+dfsgreal-1) UNRELEASED; urgency=low
+
+ [ Alexander Golovko ]
+ * debian/patches/switch-nonfree-sha1-to-openssl.patch
+ (Closes: #658326):
+ + switch from upstream nonfree SHA1 implementation to openssl
+ * debian/patches/fix-binutils-gold-linking.patch (Closes: #553956):
+ + fix linking with binutils-gold.
+ * debian/patches/fix-readline-ncurses-depends.patch
+ (Closes: #646730):
+ + fix ncurses requirement for readline-compiled bconsole, thanks
+ to Sven Joachim <svenjoac at gmx.de>.
+
+ [ Bartosz Cisek ]
+ * debian/rules:
+ + fix --with-dir-passowrd= typo.
+
+ [ Ben Hutchings ]
+ * debian/control:
+ + add autoconf to Build-Depends:.
+ * debian/patches/fix-mysql-autoconf.patch:
+ + fix FTBFS with multi-arch libmysqlclient-dev (Closes: #672765).
+ * debian/rules:
+ + recreate configure script on build.
+
+ [ Jan Hauke Rahm ]
+ * debian/*:
+ + rework patching to use 3.0 (quilt).
++ + rewrite to use debhelper.
+ * debian/bacula-director-mysql.script.5.0.0,
+ debian/rules:
+ - remove lenny->squeeze upgrade path.
++ + don't add useless call to ldconfig
+ * debian/bacula-director-sqlite3.config,
+ debian/bacula-director-sqlite3.postinst,
- debian/control (Closes: #612352):
- - remove sqlite->sqlite3 upgrade path (lenny->squeeze).
++ debian/control:
++ - remove sqlite->sqlite3 upgrade path (lenny->squeeze) (Closes: #612352).
++ + update git-repository url
+ * debian/bacula-traymonitor.links:
+ + also link the man page for traymonitor.
+ * debian/bacula-director-common.bacula-director.init,
+ debian/bacula-fd.init, debian/bacula-sd.init (Closes: #608600):
+ + Fix: init scripts fail if daemon already running
- * debian/*:
- + rewrite to use debhelper.
+ * debian/patches/remove-use-statement-for-mysql:
+ + remove "use <dbname>" statement from database setup/update
+ scripts because we can't provide correct database name in it.
+ * debian/*bacula-director.init:
+ + move bacula-director init script from bacula-director-common
+ package into bacula-director-<dbtype> packages.
++ * debian/*.install (Closes: #621282):
++ + stop shipping .la files
+
+ [ Luca Capello ]
+ * debian/patches/upstream-1623_debian-591293___file_jpfid_idx.patch:
+ + import from Git commit:fc7990a.
+ * debian/README.Debian:
+ + explain why upstream sources are not DFSG-free.
+
+ [ Martin Pitt ]
+ * debian/control (Closes: #639466):
+ + update libpq-dev Build-Depends: to 9.1.
+ + Build-Depends: on postgresql-server-dev-all.
+ + leave only the unversioned postgresql-client package in
+ bacula-director-pgsql's Depends: and Recommends:.
+
+ --
+
bacula (5.0.3-1) unstable; urgency=low
* [27362ff7] Adopted by bacula packaging group (Closes: #612296)
diff --combined debian/control
index c87faee,593e1c8..7a13681
--- a/debian/control
+++ b/debian/control
@@@ -3,18 -3,18 +3,18 @@@ Section: admi
Priority: optional
Maintainer: Debian Bacula packaging Group <pkg-bacula-devel at lists.alioth.debian.org>
Uploaders: Jan Hauke Rahm <jhr at debian.org>
-Build-Depends: autotools-dev, debhelper (>= 8.1.3), po-debconf,
+Build-Depends: autotools-dev, autoconf, debhelper (>= 8.1.3), po-debconf,
zlib1g-dev, libreadline-dev, libjconv-dev,
- libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4),
- postgresql-server-dev-8.4,
+ libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 9.1),
+ postgresql-server-dev-all,
libwrap0-dev, python-dev, libgtk2.0-dev,
libgnome2-dev, libacl1-dev, libkrb5-dev, libgnomeui-dev,
libx11-dev, mtx, bc, libxt-dev, libqt4-dev,
- libssl-dev, procps
+ libssl-dev
Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
Standards-Version: 3.8.3
- Vcs-Browser: http://git.debian.org/?p=users/jgoerzen/bacula
- Vcs-Git: git://git.debian.org/git/users/jgoerzen/bacula
+ Vcs-Browser: http://git.debian.org/?p=pkg-bacula/bacula.git;a=summary
+ Vcs-Git: git://git.debian.org/pkg-bacula/bacula.git
Homepage: http://www.bacula.org/
Package: bacula
@@@ -235,11 -235,11 +235,11 @@@ Description: backup system - debug symb
Package: bacula-director-pgsql
Architecture: any
-Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, postgresql-client-8.4, ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
+Depends: bacula-director-common (= ${binary:Version}), dbconfig-common, postgresql-client (>= 7.4), ${shlibs:Depends}, bacula-common-pgsql (>= ${binary:Version}), ${misc:Depends}
Conflicts: bacula-director
Provides: bacula-director
Replaces: bacula-director
-Recommends: postgresql-8.4
+Recommends: postgresql (>= 7.4)
Suggests: postgresql-contrib, postgresql-doc
Description: network backup, recovery and verification - PostgreSQL storage for Director
Bacula is a set of programs to manage backup, recovery and verification of
@@@ -310,7 -310,7 +310,7 @@@ Description: backup system - debug symb
responsible for providing the file attributes and data when requested by
the Director, and also for the file system-dependent part of restoration.
.
- This package contains the file director's debugging symbols.
+ This package contains the file daemon's debugging symbols.
Package: bacula-server
Architecture: all
diff --combined debian/rules
index ab2906d,15299e1..d992b7c
--- a/debian/rules
+++ b/debian/rules
@@@ -23,7 -23,7 +23,7 @@@ CONF_ALL = --enable-smartalloc
--enable-batch-insert \
--without-qwt \
--enable-ipv6 \
- --with-dir-passowrd=XXX_DIRPASSWORD_XXX \
+ --with-dir-password=XXX_DIRPASSWORD_XXX \
--with-fd-password=XXX_FDPASSWORD_XXX \
--with-sd-password=XXX_SDPASSWORD_XXX \
--with-mon-dir-password=XXX_MONDIRPASSWORD_XXX \
@@@ -113,10 -113,7 +113,10 @@@ override_dh_installinit
override_dh_install:
chmod 755 debian/additions/postinst-common
chmod 755 debian/scripts/extract_here
- dh_install
+ dh_install \
+ -Nbacula-director-pgsql -Nbacula-sd-pgsql -Nbacula-common-pgsql \
+ -Nbacula-director-mysql -Nbacula-sd-mysql -Nbacula-common-mysql \
+ -Nbacula-director-sqlite3 -Nbacula-sd-sqlite3 -Nbacula-common-sqlite3
chmod 755 debian/bacula-common/usr/lib/bacula/btraceback
######### dbconfig-common stuff
# Sometimes the latest release doesn't have a copy of the data in updatedb.
@@@ -124,9 -121,9 +124,9 @@@
# versions to an ext-upgrade-db line.
#
# lenny -> squeeze is 10 -> 12
- $(foreach db,$(VARIANTS),$(call ext-upgrade-db,$(db),10_to_11,3.0.0))
- $(foreach db,$(VARIANTS),$(call ext-upgrade-latest-db,$(db),5.0.0)) # 5.0.0 upgrade 11 to 12
- $(foreach db,$(VARIANTS),$(call ext-install-db,$(db)))
+ $(foreach db,$(VARIANTS),$(call ext-upgrade-db,$(db),10_to_11,3.0.0);)
+ $(foreach db,$(VARIANTS),$(call ext-upgrade-latest-db,$(db),5.0.0);) # 5.0.0 upgrade 11 to 12
+ $(foreach db,$(VARIANTS),$(call ext-install-db,$(db));)
override_dh_installdocs:
dh_installdocs -pbacula --link-doc=bacula-common
@@@ -136,7 -133,6 +136,7 @@@
dh_installdocs -Nbacula
override_dh_auto_build:
+ autoconf -I autoconf/ -o configure autoconf/configure.in
dh_prep
dh_installdirs
dh_auto_configure -- $(CONF_ALL) $(CONF_pgsql)
@@@ -144,13 -140,11 +144,13 @@@
dh_auto_install
dh_install -pbacula-director-pgsql -pbacula-sd-pgsql -pbacula-common-pgsql
dh_auto_clean
+ rm -rf debian/tmp
dh_auto_configure -- $(CONF_ALL) $(CONF_mysql)
dh_auto_build --parallel
dh_auto_install
dh_install -pbacula-director-mysql -pbacula-sd-mysql -pbacula-common-mysql
dh_auto_clean
+ rm -rf debian/tmp
dh_auto_configure -- $(CONF_ALL) $(CONF_sqlite3)
dh_auto_build --parallel
dh_auto_install
@@@ -162,7 -156,9 +162,10 @@@ override_dh_strip
done
dh_strip
+ override_dh_makeshlibs:
+ dh_makeshlibs -n
+
+override_dh_prep:
override_dh_auto_configure:
override_dh_auto_test:
override_dh_auto_install:
--
Bacula, a network backup, recovery and verification program
More information about the pkg-bacula-commits
mailing list