[pkg-bacula-commits] [bacula] 11/15: Remove all references to bacula-traymonitor as it has been removed upstream

Tue Jul 21 12:54:44 UTC 2015

This is an automated email from the git hooks/post-receive script.

cl-guest pushed a commit to branch master
in repository bacula.

commit 72a4ac496970ad4e87a82b91ad7bee6e0b53d989
Author: Carsten Leonhardt <leo at debian.org>
Date:   Tue Jul 21 12:13:31 2015 +0200

    Remove all references to bacula-traymonitor as it has been removed upstream
---
 debian/bacula-common.install          |  1 -
 debian/bacula-traymonitor.install     |  3 --
 debian/bacula-traymonitor.links       |  5 ---
 debian/bacula-traymonitor.manpages    |  1 -
 debian/bacula-traymonitor.menu.unused |  2 -
 debian/bacula-traymonitor.postinst    | 70 -----------------------------------
 debian/bacula-traymonitor.postrm      | 18 ---------
 debian/control                        | 26 -------------
 debian/rules                          |  3 --
 9 files changed, 129 deletions(-)

diff --git a/debian/bacula-common.install b/debian/bacula-common.install
index 9cc5eaa..8dd32d2 100644
--- a/debian/bacula-common.install
+++ b/debian/bacula-common.install
@@ -8,7 +8,6 @@ usr/sbin/btraceback		usr/lib/bacula
 usr/sbin/bsmtp
 debian/additions/common-functions.init		usr/share/bacula-common
 debian/additions/common-functions.dpkg		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
diff --git a/debian/bacula-traymonitor.install b/debian/bacula-traymonitor.install
deleted file mode 100644
index bd15d66..0000000
--- a/debian/bacula-traymonitor.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/sbin/bacula-tray-monitor
-src/tray-monitor/generic.xpm	usr/share/pixmaps
-scripts/bacula-tray-monitor.desktop	usr/share/applications
diff --git a/debian/bacula-traymonitor.links b/debian/bacula-traymonitor.links
deleted file mode 100644
index 50ba6a5..0000000
--- a/debian/bacula-traymonitor.links
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/man/man1/bacula-tray-monitor.1.gz usr/share/man/man1/bacula-traymonitor.1.gz
-usr/sbin/bacula-tray-monitor usr/sbin/bacula-traymonitor
-# remove the following post-wheezy
-usr/sbin/bacula-tray-monitor usr/bin/bacula-tray-monitor
-usr/sbin/bacula-tray-monitor usr/bin/bacula-traymonitor
diff --git a/debian/bacula-traymonitor.manpages b/debian/bacula-traymonitor.manpages
deleted file mode 100644
index 611c964..0000000
--- a/debian/bacula-traymonitor.manpages
+++ /dev/null
@@ -1 +0,0 @@
-manpages/bacula-tray-monitor.1
diff --git a/debian/bacula-traymonitor.menu.unused b/debian/bacula-traymonitor.menu.unused
deleted file mode 100644
index c82330b..0000000
--- a/debian/bacula-traymonitor.menu.unused
+++ /dev/null
@@ -1,2 +0,0 @@
-?package(bacula-traymonitor):needs="X11" section="Apps/System"\
-  title="Bacula tray monitor" command="/usr/bin/bacula-tray-monitor"
diff --git a/debian/bacula-traymonitor.postinst b/debian/bacula-traymonitor.postinst
deleted file mode 100644
index e363d9f..0000000
--- a/debian/bacula-traymonitor.postinst
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# postinst script for bacula
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-SRCDIR="/usr/share/bacula-common/defconfig"
-DSTDIR="/etc/bacula"
-CONFIG="tray-monitor.conf"
-
-. /usr/share/bacula-common/common-functions.dpkg
-readOrCreatePasswords
-
-case "$1" in
-    configure)
-
-        if [ ! -f $DSTDIR/$CONFIG ]; then
-            TARGET=$DSTDIR/$CONFIG
-        else
-            TARGET=$DSTDIR/$CONFIG.dist
-        fi
-
-	sed -e s~@debian_hostname@~`hostname`~ \
-	-e s~XXX_MONDIRPASSWORD_XXX~$DIRMPASSWD~ \
-	-e s~XXX_MONFDPASSWORD_XXX~$FDMPASSWD~ \
-	-e s~XXX_MONSDPASSWORD_XXX~$SDMPASSWD~ \
-		< $SRCDIR/$CONFIG > $TARGET
-
-        chown root:bacula $TARGET
-        chmod 640 $TARGET
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/bacula-traymonitor.postrm b/debian/bacula-traymonitor.postrm
deleted file mode 100644
index d99df06..0000000
--- a/debian/bacula-traymonitor.postrm
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh
-
-set -e
-
-
-case "$1" in
-    purge)
-        rm -f  /etc/bacula/tray-monitor.conf /etc/bacula/tray-monitor.conf.*
-    ;;
-esac
-
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/control b/debian/control
index 3af00a4..aed3713 100644
--- a/debian/control
+++ b/debian/control
@@ -258,7 +258,6 @@ Package: bacula-client
 Architecture: all
 Depends: bacula-console (>= ${source:Version}), bacula-fd
  (>= ${source:Version}), ${misc:Depends}
-Recommends: bacula-traymonitor
 Description: network backup service - client metapackage
  Bacula is a set of programs to manage backup, recovery, and verification of
  data across a network of computers of different kinds.
@@ -274,7 +273,6 @@ Package: bacula-fd
 Architecture: any
 Depends: bacula-common (= ${binary:Version}), lsb-base, ucf, ${shlibs:Depends},
  ${misc:Depends}
-Suggests: bacula-traymonitor
 Description: network backup service - file daemon
  Bacula is a set of programs to manage backup, recovery, and verification of
  data across a network of computers of different kinds.
@@ -483,27 +481,3 @@ Description: network backup service - Bacula Administration Tool (debugging)
  data across a network of computers of different kinds.
  .
  This package provides debugging symbols for bacula-console-qt.
-
-Package: bacula-traymonitor
-Architecture: any
-Depends: ${shlibs:Depends}, bacula-common (= ${binary:Version}),
- ${misc:Depends}
-Suggests: kde | gnome-desktop-environment
-Description: network backup service - tray monitor
- Bacula is a set of programs to manage backup, recovery, and verification of
- data across a network of computers of different kinds.
- .
- This package provides a tray monitor for the Bacula backup system,
- which constantly displays Bacula's status. It is FreeDesktop-compatible,
- so it will work under both KDE and GNOME.
-
-Package: bacula-traymonitor-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: bacula-traymonitor (= ${binary:Version}), ${misc:Depends}
-Description: network backup service - tray monitor (debugging)
- Bacula is a set of programs to manage backup, recovery, and verification of
- data across a network of computers of different kinds.
- .
- This package provides debugging symbols for bacula-traymonitor.
diff --git a/debian/rules b/debian/rules
index 03ee7cb..0c1b86e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -123,9 +123,6 @@ override_dh_install:
 	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db) 5.0.0 12)) # 5.0.0 upgrade 11 to 12
 	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db) 5.2.0))    # 5.2.0 upgrade 12 to 14
 	$(foreach db,$(VARIANTS),$(shell debian/scripts/install-dbconfig $(db)))
-	# dh_install can not rename files, so doing here
-	mv debian/bacula-traymonitor/usr/share/pixmaps/generic.xpm \
-		debian/bacula-traymonitor/usr/share/pixmaps/bacula-tray-monitor.xpm
 	# fix database type in some scripts
 	$(foreach db,$(VARIANTS),sed -i \
 	  -e "s/XX_DB_XX/$(db)/" \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git

