[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-6-21-gbbe70c0

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 595829670fcf9555b1f50897655d3ae23cca65e6
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sun Nov 25 19:56:01 2012 +0400

    Remove incorrect systemd service files

diff --git a/debian/bacula-director-mysql.install b/debian/bacula-director-mysql.install
index 66ece38..7ee3d70 100644
--- a/debian/bacula-director-mysql.install
+++ b/debian/bacula-director-mysql.install
@@ -6,4 +6,3 @@ etc/bacula/scripts/*catalog_backup.pl
 debian/additions/mysql/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
 usr/sbin/dbcheck
-platforms/systemd/bacula-dir.service	lib/systemd/system
diff --git a/debian/bacula-director-pgsql.install b/debian/bacula-director-pgsql.install
index 7368210..6627f58 100644
--- a/debian/bacula-director-pgsql.install
+++ b/debian/bacula-director-pgsql.install
@@ -8,4 +8,3 @@ debian/additions/pgsql/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
 usr/sbin/dbcheck
 debian/additions/pgsql/database/pgsql	usr/share/dbconfig-common/data/bacula-director-pgsql/install-dbadmin
-platforms/systemd/bacula-dir.service	lib/systemd/system
diff --git a/debian/bacula-director-sqlite3.install b/debian/bacula-director-sqlite3.install
index 3f6b4eb..a895be0 100644
--- a/debian/bacula-director-sqlite3.install
+++ b/debian/bacula-director-sqlite3.install
@@ -7,4 +7,3 @@ etc/bacula/scripts/*catalog_backup.pl
 debian/additions/sqlite3/make_catalog_backup_awk      etc/bacula/scripts
 usr/sbin/bacula-dir
 usr/sbin/dbcheck
-platforms/systemd/bacula-dir.service	lib/systemd/system
diff --git a/debian/bacula-sd.install b/debian/bacula-sd.install
index df49c21..b5b5ea2 100644
--- a/debian/bacula-sd.install
+++ b/debian/bacula-sd.install
@@ -5,4 +5,3 @@ etc/bacula/scripts/mtx-changer
 etc/bacula/scripts/mtx-changer.conf
 etc/bacula/scripts/disk-changer
 etc/bacula/scripts/dvd-handler
-platforms/systemd/bacula-sd.service	lib/systemd/system
diff --git a/debian/changelog b/debian/changelog
index ffd851e..bb9464e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,10 @@ bacula (5.2.6+dfsg-2+deb7u1) testing; urgency=high
     + switch /etc/bacula/scripts/delete_catalog_backup undef ucf control.
   * Debconf templates and debian/control reviewed by the debian-l10n-
     english team as part of the Smith review project. (Closes: #687240)
+  * debian/bacula-sd.install, bacula-director-{sqlite3,mysql,pgsql}.install,
+    debian/rules:
+    - Remove incorrect systemd service files for bacula-director and
+      bacula-sd due to unaccepted for freeze changes in fixes.
 
   [ Bart Swedrowski ]
   * debian/bacula-console.postinst,debian/bacula-console-qt.postinst,
diff --git a/debian/rules b/debian/rules
index 129fd42..03ee7cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -131,8 +131,7 @@ override_dh_install:
 	  -e "s/XX_DB_XX/$(db)/" \
 		-e "s/XX_DBLONGNAME_XX/$(LONGNAME_$(db))/" \
 		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup \
-		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup.pl \
-		debian/bacula-director-$(db)/lib/systemd/system/bacula-dir.service;)
+		debian/bacula-director-$(db)/etc/bacula/scripts/make_catalog_backup.pl;)
 
 
 override_dh_installdocs:

-- 
Bacula, a network backup, recovery and verification program