From 83db5ccf2e17cfde8ff3d76d3194c50b2c2d135b Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Sat, 8 Nov 2014 11:45:40 +0100 Subject: [PATCH] fixes some warnings from qa.debian.org See https://packages.qa.debian.org/b/bareos.html: file permission of the copyright file, file permission of the logrotate config file, remove automatic password helper file, do not suggests dds2tar, as it is only for DAT tape drives and not directly used by Bareos. --- debian/Makefile | 2 +- debian/bareos-common.dirs | 4 ++-- debian/bareos-director.dirs | 2 +- debian/control | 14 +++++++------- debian/control.in | 14 +++++++------- debian/control.univention-bareos | 3 ++- debian/copyright | 0 debian/univention-bareos.substvars | 1 - platforms/debian/Makefile.in | 2 +- platforms/hurd/Makefile.in | 2 +- platforms/redhat/Makefile.in | 2 +- scripts/Makefile.in | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) mode change 100755 => 100644 debian/copyright delete mode 100644 debian/univention-bareos.substvars diff --git a/debian/Makefile b/debian/Makefile index 1fcd163d9a3..36f910235d7 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -5,7 +5,7 @@ all: copyright copyright: copyright.header copyright.footer - @install copyright.header copyright + @cat copyright.header > copyright @sed -r -e 's/^$$/./' -e 's/^[ ]*(.*)$$/ \1/' ../LICENSE >> copyright @cat copyright.footer >> copyright diff --git a/debian/bareos-common.dirs b/debian/bareos-common.dirs index 55a635bbd60..7c3893967b1 100644 --- a/debian/bareos-common.dirs +++ b/debian/bareos-common.dirs @@ -1,3 +1,3 @@ -/etc/bareos/bareos-dir.d +/etc/bareos /var/lib/bareos -/var/log/bareos \ No newline at end of file +/var/log/bareos diff --git a/debian/bareos-director.dirs b/debian/bareos-director.dirs index b4b764b04aa..7c3b99ed83e 100644 --- a/debian/bareos-director.dirs +++ b/debian/bareos-director.dirs @@ -1,2 +1,2 @@ -/etc/bareos +/etc/bareos/bareos-dir.d /usr/lib/bareos diff --git a/debian/control b/debian/control index 43fb51290bf..ec3901a7848 100644 --- a/debian/control +++ b/debian/control @@ -44,9 +44,9 @@ Build-Depends: acl-dev, # univention: # ucslint, univention-config-dev Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools -Standards-Version: 3.9.5 -Vcs-Git: git://github.com/bareos/bareos.git -b master -Vcs-Browser: https://github.com/bareos/bareos/tree/master +Standards-Version: 3.9.6 +Vcs-Git: git://github.com/bareos/bareos.git -b bareos-14.2 +Vcs-Browser: https://github.com/bareos/bareos/tree/bareos-14.2 Homepage: http://www.bareos.org/ @@ -196,7 +196,7 @@ Description: Backup Archiving Recovery Open Sourced - development files Package: bareos-director Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser -Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends} +Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), lsof, bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends} Recommends: logrotate Conflicts: bacula-director Replaces: bacula-director @@ -214,7 +214,7 @@ Description: Backup Archiving Recovery Open Sourced - director daemon Package: bareos-filedaemon Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser -Depends: bareos-common (= ${binary:Version}), ${shlibs:Depends}, lsb-base (>= 3.2-13), lsof, ${misc:Depends} +Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, ${shlibs:Depends}, ${misc:Depends} Conflicts: bacula-fd Replaces: bacula-fd Description: Backup Archiving Recovery Open Sourced - file daemon @@ -231,7 +231,7 @@ Description: Backup Archiving Recovery Open Sourced - file daemon Package: bareos-storage Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser -Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, python, ${shlibs:Depends}, ${misc:Depends} +Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, ${shlibs:Depends}, ${misc:Depends} Conflicts: bacula-sd Replaces: bacula-sd Description: Backup Archiving Recovery Open Sourced - storage daemon @@ -264,7 +264,7 @@ Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser Depends: bareos-common (= ${binary:Version}), bareos-storage (= ${binary:Version}), lsb-base (>= 3.2-13), mtx, ${shlibs:Depends}, ${misc:Depends} Recommends: mt-st -Suggests: dds2tar, scsitools, sg3-utils +Suggests: scsitools, sg3-utils Description: Backup Archiving Recovery Open Sourced - storage daemon tape support Bareos is a set of programs to manage backup, recovery and verification of data across a network of computers of different kinds. diff --git a/debian/control.in b/debian/control.in index 85a2e729b19..228c0dead67 100644 --- a/debian/control.in +++ b/debian/control.in @@ -42,9 +42,9 @@ Build-Depends: acl-dev, # univention: # ucslint, univention-config-dev Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools -Standards-Version: 3.9.5 -#Vcs-Git: git://git.debian.org/collab-maint/bareos.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/bareos.git;a=summary +Standards-Version: 3.9.6 +Vcs-Git: git://github.com/bareos/bareos.git -b bareos-14.2 +Vcs-Browser: https://github.com/bareos/bareos/tree/bareos-14.2 Homepage: http://www.bareos.org/ @@ -194,7 +194,7 @@ Description: Backup Archiving Recovery Open Sourced - development files Package: bareos-director Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser -Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends} +Depends: bareos-common (= ${binary:Version}), bareos-database-common (= ${binary:Version}), bareos-database-tools, lsb-base (>= 3.2-13), lsof, bsd-mailx | mailx, ${shlibs:Depends}, ${misc:Depends} Recommends: logrotate Conflicts: bacula-director Replaces: bacula-director @@ -212,7 +212,7 @@ Description: Backup Archiving Recovery Open Sourced - director daemon Package: bareos-filedaemon Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser -Depends: bareos-common (= ${binary:Version}), ${shlibs:Depends}, lsb-base (>= 3.2-13), lsof, ${misc:Depends} +Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, ${shlibs:Depends}, ${misc:Depends} Conflicts: bacula-fd Replaces: bacula-fd Description: Backup Archiving Recovery Open Sourced - file daemon @@ -229,7 +229,7 @@ Description: Backup Archiving Recovery Open Sourced - file daemon Package: bareos-storage Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser -Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, python, ${shlibs:Depends}, ${misc:Depends} +Depends: bareos-common (= ${binary:Version}), lsb-base (>= 3.2-13), lsof, ${shlibs:Depends}, ${misc:Depends} Conflicts: bacula-sd Replaces: bacula-sd Description: Backup Archiving Recovery Open Sourced - storage daemon @@ -262,7 +262,7 @@ Architecture: any Pre-Depends: debconf (>= 1.4.30) | debconf-2.0, adduser Depends: bareos-common (= ${binary:Version}), bareos-storage (= ${binary:Version}), lsb-base (>= 3.2-13), mtx, ${shlibs:Depends}, ${misc:Depends} Recommends: mt-st -Suggests: dds2tar, scsitools, sg3-utils +Suggests: scsitools, sg3-utils Description: Backup Archiving Recovery Open Sourced - storage daemon tape support Bareos is a set of programs to manage backup, recovery and verification of data across a network of computers of different kinds. diff --git a/debian/control.univention-bareos b/debian/control.univention-bareos index dfb94479190..f3e29e9fb5e 100644 --- a/debian/control.univention-bareos +++ b/debian/control.univention-bareos @@ -3,7 +3,8 @@ Architecture: all Depends: univention-postgresql, postgresql-8.4, bareos (>= 12.4.4), bareos-database-common, bareos-database-postgresql, dbconfig-common, bareos-database-tools, univention-join (>> 5.0.20-1.436), - shell-univention-lib (>> 2.0.17-1.125) + shell-univention-lib (>> 2.0.17-1.125), + univention-config Description: meta package for univention-bareos-integration This package integrates the bareos backup solution into UCS. The package provides automatic configuration of the diff --git a/debian/copyright b/debian/copyright old mode 100755 new mode 100644 diff --git a/debian/univention-bareos.substvars b/debian/univention-bareos.substvars deleted file mode 100644 index e30d4c1f68f..00000000000 --- a/debian/univention-bareos.substvars +++ /dev/null @@ -1 +0,0 @@ -misc:Depends=debconf (>= 0.5) | debconf-2.0, univention-config (>= 7.0.25) diff --git a/platforms/debian/Makefile.in b/platforms/debian/Makefile.in index aa2cb36df09..607f78277dc 100644 --- a/platforms/debian/Makefile.in +++ b/platforms/debian/Makefile.in @@ -17,7 +17,7 @@ install-autostart: install-autostart-fd install-autostart-sd install-autostart-d install_logrotate: @$(MKDIR) $(DESTDIR)/etc/logrotate.d - @$(INSTALL_PROGRAM) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir + @$(INSTALL_DATA) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir install-autostart-fd: @echo "Installing bareos-fd boot script ..." diff --git a/platforms/hurd/Makefile.in b/platforms/hurd/Makefile.in index 8ff6299c94f..d9028622221 100644 --- a/platforms/hurd/Makefile.in +++ b/platforms/hurd/Makefile.in @@ -16,7 +16,7 @@ install-autostart: install-autostart-fd install-autostart-sd install-autostart-d install_logrotate: @$(MKDIR) $(DESTDIR)/etc/logrotate.d - @$(INSTALL_PROGRAM) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir + @$(INSTALL_DATA) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir install-autostart-fd: @echo "Installing bareos-fd boot script ..." diff --git a/platforms/redhat/Makefile.in b/platforms/redhat/Makefile.in index 13926a85de4..568d52aab42 100644 --- a/platforms/redhat/Makefile.in +++ b/platforms/redhat/Makefile.in @@ -16,7 +16,7 @@ install-autostart: install-autostart-fd install-autostart-sd install-autostart-d install_logrotate: @$(MKDIR) $(DESTDIR)/etc/logrotate.d - @$(INSTALL_PROGRAM) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir + @$(INSTALL_DATA) ../../scripts/logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir install-autostart-fd: @if test x$(DESTDIR) = x -a -f /etc/rc.d/init.d/bareos-fd; then \ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 0e5db4fb9c8..9c4cc6b4a94 100755 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -65,7 +65,7 @@ install: installdirs $(INSTALL_SCRIPT) bareos-config-lib.sh ${DESTDIR}${scriptdir}/bareos-config-lib.sh $(INSTALL_SCRIPT) bareos-explorer ${DESTDIR}${scriptdir}/bareos-explorer $(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback - #$(INSTALL_SCRIPT) logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir + #$(INSTALL_DATA) logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir Makefile: Makefile.in cd $(topdir) \