Debian packages for bareos-bat and bareos-traymonitor

Debian packages for bareos-bat, bareos-traymonitor and bareos-devel.
Added configure opition --enable-traymonitor (again).
Uses qmake "make" and "make install" instead of special handling in SPEC file.
Moved files belonging to BAT and traymonitor from directory scripts
to source directories.

Signed-off-by: Marco van Wieringen <marco.van.wieringen@bareos.com>

Makefile.in

@@ -19,7 +19,7 @@ dummy:
 
 # --client-only directories
 fd_subdirs = src scripts src/lib src/findlib src/filed \
-       @READLINE_SRC@ @BAT_DIR@ src/console @FD_PLUGIN_DIR@
+       @READLINE_SRC@ @BAT_DIR@ @TRAY_MONITOR_DIR@ src/console @FD_PLUGIN_DIR@
 
 # Non-client-only directores
 subdirs = src/cats @NDMP_DIR@ @DIRD_DIR@ @STORED_DIR@ @SD_PLUGIN_DIR@ @DIR_PLUGIN_DIR@ src/tools

autoconf/config.h.in

@@ -858,6 +858,9 @@
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE
 
+/* Define to 1 if tray-monitor Qt4 GUI support should be enabled */
+#undef HAVE_TRAYMONITOR
+
 /* Define to 1 if you have the `tsearch' function. */
 #undef HAVE_TSEARCH
 

autoconf/configure.in

@@ -342,9 +342,7 @@ support_smartalloc=yes
 support_readline=yes
 support_conio=yes
 support_bat=no
-support_tray_monitor=no
-support_tls=no
-support_crypto=no
+support_traymonitor=no
 support_static_tools=no
 support_static_fd=no
 support_static_sd=no
@@ -389,6 +387,33 @@ fi
 
 AC_SUBST(BAT_DIR)
 
+dnl -------------------------------------------
+dnl tray-monitor (default off)
+dnl -------------------------------------------
+AC_ARG_ENABLE(traymonitor,
+   AC_HELP_STRING([--enable-traymonitor], [enable build of traymonitor @<:@default=no@:>@]),
+   [
+       if test x$enableval = xyes; then
+      AC_DEFINE(HAVE_TRAYMONITOR, 1, [Define to 1 if tray-monitor Qt4 GUI support should be enabled])
+      support_traymonitor=yes
+       fi
+   ]
+)
+
+TRAY_MONITOR_DIR=
+if test x$support_traymonitor = xyes; then
+   abc=`$PKGCONFIG --atleast-version=4.6 QtGui`
+   pkg=$?
+   if test $pkg = 0; then
+      TRAY_MONITOR_DIR=src/qt-console/tray-monitor
+   else
+      AC_MSG_ERROR(Unable to find suitable Qt4 installation needed by tray-monitor)
+   fi
+fi
+
+AC_SUBST(TRAY_MONITOR_DIR)
+
+
 dnl -------------------------------------------
 dnl smartalloc (default off)
 dnl -------------------------------------------
@@ -3499,20 +3524,18 @@ AC_OUTPUT([autoconf/Make.common \
 	   scripts/logrotate \
 	   scripts/mtx-changer \
 	   scripts/disk-changer \
-	   scripts/bareos-tray-monitor.desktop \
 	   scripts/logwatch/Makefile \
 	   scripts/logwatch/logfile.bareos.conf \
-	   scripts/bat.desktop \
-	   scripts/bat.desktop.xsu \
-	   scripts/bat.desktop.consolehelper \
 	   scripts/bat.console_apps \
 	   src/Makefile \
 	   src/include/host.h \
 	   src/console/Makefile \
 	   src/console/bconsole.conf \
+       src/qt-console/tray-monitor/bareos-tray-monitor.desktop \
+       src/qt-console/tray-monitor/tray-monitor.conf \
 	   src/qt-console/tray-monitor/tray-monitor.pro \
-	   src/qt-console/tray-monitor/tray-monitor.conf \
 	   src/qt-console/bat.conf \
+       src/qt-console/bat.desktop \
 	   src/qt-console/bat.pro \
 	   src/qt-console/install_conf_file \
 	   src/dird/Makefile \
@@ -3572,6 +3595,7 @@ if test "${support_bat}" = "yes" ; then
 
    cd src/qt-console
    echo "Creating bat Makefile"
+   # hack: required to get "make install" to work
    touch bat
    chmod 755 bat
    rm -f Makefile
@@ -3580,6 +3604,23 @@ if test "${support_bat}" = "yes" ; then
    cd ${BUILD_DIR}
 fi
 
+if test "${support_traymonitor}" = "yes" ; then
+   if test "x$QMAKE" = "xnone"; then
+      AC_MSG_ERROR([Could not find qmake $PATH. Check your Qt installation])
+   fi
+
+   cd src/qt-console/tray-monitor
+   echo "Creating tray-monitor Makefile"
+   # hack: required to get "make install" to work
+   touch bareos-tray-monitor
+   chmod 755 bareos-tray-monitor
+   rm -f Makefile
+   $QMAKE
+   ${MAKE:-make} clean
+   cd ${BUILD_DIR}
+fi
+
+
 dnl
 dnl if CC is gcc, we can rebuild the dependencies (since the depend rule
 dnl requires gcc).  If it's not, don't rebuild dependencies
@@ -3708,6 +3749,7 @@ Configuration on `date`:
    enable-smartalloc:	     ${support_smartalloc}
    enable-lockmgr:	     ${support_lockmgr}
    bat support: 	     ${support_bat}
+   tray-monitor support:     ${support_traymonitor}
    client-only: 	     ${build_client_only}
    build-dird:		     ${build_dird}
    build-stored:	     ${build_stored}

debian/bareos-bat.install

@@ -0,0 +1,9 @@
+#%attr(-, root, %{daemon_group}) %{_sbindir}/bat
+#%attr(640, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/bat.conf
+/usr/sbin/bat
+/etc/bareos/bat.conf
+/usr/share/pixmaps/bat.png
+/usr/share/pixmaps/bat.svg
+/usr/share/applications/bat.desktop
+/usr/share/man/man1/bat.1.gz
+/usr/share/doc/bareos/html/

debian/bareos-common.install

@@ -11,4 +11,3 @@
 /usr/sbin/btraceback
 /usr/share/man/man8/btraceback.8.gz
 /var/lib/bareos/
-#/var/lib/bareos/log

debian/bareos-devel.install

@@ -0,0 +1,2 @@
+/usr/lib/*.la
+/usr/include/bareos

debian/bareos-traymonitor.install

@@ -1,6 +1,6 @@
-#/etc/bareos/tray-monitor.conf
-#/usr/sbin/bareos-tray-monitor-qt
-#/usr/share/man/man1/bareos-tray-monitor.1.gz
-#/etc/xdg/autostart/bareos-tray-monitor.desktop
-#/usr/share/applications/bareos-tray-monitor.desktop
-#/usr/share/pixmaps/bareos-tray-monitor.xpm
+/etc/bareos/tray-monitor.conf
+/etc/xdg/autostart/bareos-tray-monitor.desktop
+/usr/sbin/bareos-tray-monitor
+/usr/share/man/man1/bareos-tray-monitor.1.gz
+/usr/share/applications/bareos-tray-monitor.desktop
+/usr/share/pixmaps/bareos-tray-monitor.xpm

debian/rules

@@ -43,6 +43,8 @@ override_dh_auto_configure:
   --enable-batch-insert \
   --enable-dynamic-cats-backends \
   --enable-acl \
+  --enable-bat \
+  --enable-traymonitor \
   --enable-xattr \
   --enable-scsi-crypto \
   --enable-ndmp \

platforms/gentoo/bareos.ebuild

@@ -120,7 +120,7 @@ src_compile() {
 
 	if use gnome
 	then
-	myconf="${myconf} --enable-tray-monitor"
+	myconf="${myconf} --enable-traymonitor"
 	fi
 
 	./configure \

platforms/rpms/bareos.spec

@@ -447,6 +447,9 @@ export MTX=/usr/sbin/mtx
   --enable-xattr \
 %if 0%{?build_bat}
   --enable-bat \
+%endif
+%if 0%{?build_qt_monitor}
+  --enable-traymonitor \
 %endif
   --with-postgresql \
   --with-mysql \
@@ -477,13 +480,7 @@ export MTX=/usr/sbin/mtx
 #Add flags
 %__make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags};
 
-%if 0%{?build_qt_monitor}
-# build and tray-monitor manually, as this is not build and installed by make
-cd src/qt-console/tray-monitor
-qmake tray-monitor.pro
-%__make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
-cd -
-%endif
+
 
 %install
 %if 0%{?suse_version}
@@ -515,40 +512,20 @@ do
 rm -f "%{buildroot}/$F"
 done
 
-# install tray monitor
-%if 0%{?build_qt_monitor}
-install -m 755 src/qt-console/tray-monitor/.libs/bareos-tray-monitor %{buildroot}%{_sbindir}/bareos-tray-monitor-qt
-install -m 644 src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bareos/
-%endif
-
 %if 0%{?build_bat}
-# install bat
-install -m 755 src/qt-console/.libs/bat %{buildroot}%{_sbindir}
-install -m 640 src/qt-console/bat.conf %{buildroot}%{_sysconfdir}/bareos/bat.conf
-install -m 644 src/qt-console/images/bat_icon.png %{buildroot}/usr/share/pixmaps/bat_icon.png
 %if 0%{?suse_version} > 1010
-%suse_update_desktop_file -c bat bat "bareos the network backup solution - BAT Bareos Admin Tool" bat bat_icon System Backup
-%suse_update_desktop_file -i bat System Backup
-%else
-install -m 644 scripts/bat.desktop %{buildroot}/usr/share/applications/
+%suse_update_desktop_file -i bat System Utility Archiving
 %endif
-
 %endif
-# end build_bat
-
-%if 0%{build_qt_monitor}
-# tray monitor desktop file
-install -d 755 %{buildroot}/etc/xdg/autostart
-install -m 644 scripts/bareos-tray-monitor.desktop %{buildroot}/usr/share/applications/
 
-%if 0%{?suse_version} > 1010
-%suse_update_desktop_file -i -r bareos-tray-monitor System Backup
-%endif
-# copy to autostart directory
-install -m 644 %{buildroot}/usr/share/applications/bareos-tray-monitor.desktop %{buildroot}/etc/xdg/autostart
-# tray monitor icon
-install -m 644 scripts/tray-monitor.xpm %{buildroot}/usr/share/pixmaps/bareos-tray-monitor.xpm
-%endif
+# install tray monitor
+# %if 0%{?build_qt_monitor}
+# %if 0%{?suse_version} > 1010
+# disables, because suse_update_desktop_file complains
+# that there are two desktop file (applications and autostart)
+# ##suse_update_desktop_file bareos-tray-monitor System Backup
+# %endif
+# %endif
 
 # install the sample-query.sql file as default query file
 #install -m 644 examples/sample-query.sql %{buildroot}%{script_dir}/query.sql
@@ -771,9 +748,9 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %files traymonitor
 %defattr(-,root, root)
 %attr(-, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/tray-monitor.conf
-%{_sbindir}/bareos-tray-monitor-qt
-%{_mandir}/man1/bareos-tray-monitor.1.gz
 %config %{_sysconfdir}/xdg/autostart/bareos-tray-monitor.desktop
+%{_sbindir}/bareos-tray-monitor
+%{_mandir}/man1/bareos-tray-monitor.1.gz
 /usr/share/applications/bareos-tray-monitor.desktop
 /usr/share/pixmaps/bareos-tray-monitor.xpm
 %endif
@@ -783,7 +760,8 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %defattr(-, root, root)
 %attr(-, root, %{daemon_group}) %{_sbindir}/bat
 %attr(640, root, %{daemon_group}) %config(noreplace) %{_sysconfdir}/bareos/bat.conf
-%{_prefix}/share/pixmaps/bat_icon.png
+%{_prefix}/share/pixmaps/bat.png
+%{_prefix}/share/pixmaps/bat.svg
 %{_prefix}/share/applications/bat.desktop
 %{_mandir}/man1/bat.1.gz
 %dir %{_docdir}/%{name}
@@ -898,12 +876,9 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
 %endif
 
 %if 0%{?build_qt_monitor}
-# TODO: only provide bareos-traymonitor
 %post traymonitor
 %{script_dir}/bareos-config initialize_local_hostname
 %{script_dir}/bareos-config initialize_passwords
-echo "linking %{_sbindir}/bareos-tray-monitor-qt %{_sbindir}/bareos-traymonitor"
-ln -sf %{_sbindir}/bareos-tray-monitor-qt %{_sbindir}/bareos-traymonitor
 %endif
 
 %if 0%{?build_bat}

scripts/bat.desktop.in → src/qt-console/bat.desktop.in

@@ -1,11 +1,13 @@
 [Desktop Entry]
 Name=Bareos Administration Tool
-Comment=Bareos Director Console
-Icon=/usr/share/pixmaps/bat_icon.png
+GenericName=Backup Administration Tool
+Comment=Bareos Administration Tool
+Icon=bat
+TryExec=@sbindir@/bat
 Exec=@sbindir@/bat -c @sysconfdir@/bat.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
 StartupNotify=true
 X-Desktop-File-Install-Version=0.3
-Categories=System;Application;Utility;X-Red-Hat-Base;
+Categories=System;Utility;Archiving;X-SuSE-Backup;

src/qt-console/bat.pro.in

@@ -21,6 +21,11 @@ confs.path = /$(DESTDIR)@sysconfdir@
 confs.commands = ./install_conf_file
 help.path = /$(DESTDIR)@htmldir@
 help.files = help/*.html images/status.png images/mail-message-new.png
+icons.path  = /$(DESTDIR)@datarootdir@/pixmaps/
+icons.files = images/bat.png images/bat.svg
+desktopentries.path  = /$(DESTDIR)@datarootdir@/applications/
+desktopentries.files = bat.desktop
+
 
 TEMPLATE     = app
 TARGET       = bat
@@ -34,7 +39,7 @@ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
 QMAKE_CLEAN += .libs/* bat
 
 macx {
-  ICON = images/bat_icon.icns
+  ICON = images/bat.icns
 }
 
 RESOURCES    = main.qrc
@@ -171,7 +176,7 @@ SOURCES += status/storstat.cpp
 HEADERS += util/fmtwidgetitem.h util/comboutil.h
 SOURCES += util/fmtwidgetitem.cpp util/comboutil.cpp
 
-INSTALLS = bins confs help
+INSTALLS = bins confs help icons desktopentries
 
 QMAKE_EXTRA_TARGETS += depend
 

src/qt-console/main.qrc

@@ -15,7 +15,7 @@
     <file>images/W.png</file>
     <file>images/applications-graphics.png</file>
     <file>images/bat.png</file>
-    <file>images/bat_icon.png</file>
+    <file>images/bat.svg</file>
     <file>images/browse.png</file>
     <file>images/cartridge-edit.png</file>
     <file>images/cartridge.png</file>

scripts/bareos-tray-monitor.desktop.in → src/qt-console/tray-monitor/bareos-tray-monitor.desktop.in

@@ -1,10 +1,13 @@
 [Desktop Entry]
-Name=Bareos Monitor
+X-SuSE-translate=true
+Name=Bareos Tray Monitor
+GenericName=Backup Tray Monitor
 Comment=Notification Tray Monitor
-Icon=bareos-tray-monitor.xpm
+Icon=bareos-tray-monitor
 Exec=@sbindir@/bareos-tray-monitor -c @sysconfdir@/tray-monitor.conf
 Terminal=false
 Type=Application
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.3
-Categories=System;Application;Utility;X-Red-Hat-Base;
+Categories=System;Utility;Archiving;X-SuSE-Backup;
+#TrayIcon;