From 4b3c5291814821a6f9824971b8a00771a378f6eb Mon Sep 17 00:00:00 2001
From: Nikola Pajkovsky <npajkovs@redhat.com>
Date: Mon, 23 Nov 2009 14:11:19 +0100
Subject: kerneloops use only one config. Kerneloops.conf merge
 addon-kerneloops and plugin-kerneloopsreporter into one package

---
 lib/Plugins/Kerneloops.conf         | 11 +++++++++++
 lib/Plugins/KerneloopsReporter.conf |  5 -----
 lib/Plugins/KerneloopsScanner.conf  |  4 ----
 lib/Plugins/Makefile.am             |  2 --
 4 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 lib/Plugins/KerneloopsReporter.conf
 delete mode 100644 lib/Plugins/KerneloopsScanner.conf

(limited to 'lib')

diff --git a/lib/Plugins/Kerneloops.conf b/lib/Plugins/Kerneloops.conf
index 47b242ff..08dacd00 100644
--- a/lib/Plugins/Kerneloops.conf
+++ b/lib/Plugins/Kerneloops.conf
@@ -1,2 +1,13 @@
 # compatibility with kerneloops.org tool
 InformAllUsers = yes
+
+# KerneloopsReporter configuration. Reports kernel crashes collected by the addon.
+################################################################################
+
+# kerneloops.org
+SubmitURL = http://submit.kerneloops.org/submitoops.php
+
+# Kerneloops Scanner configuration.
+################################################################################
+
+SysLogFile = /var/log/messages
diff --git a/lib/Plugins/KerneloopsReporter.conf b/lib/Plugins/KerneloopsReporter.conf
deleted file mode 100644
index 5ec844a3..00000000
--- a/lib/Plugins/KerneloopsReporter.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# KerneloopsReporter configuration. Reports kernel crashes collected by the addon.
-################################################################################
-
-# kerneloops.org
-SubmitURL = http://submit.kerneloops.org/submitoops.php
diff --git a/lib/Plugins/KerneloopsScanner.conf b/lib/Plugins/KerneloopsScanner.conf
deleted file mode 100644
index 36aac096..00000000
--- a/lib/Plugins/KerneloopsScanner.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Kerneloops Scanner configuration.
-################################################################################
-
-SysLogFile = /var/log/messages
diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am
index 9d80d91f..97da2204 100644
--- a/lib/Plugins/Makefile.am
+++ b/lib/Plugins/Makefile.am
@@ -29,8 +29,6 @@ dist_pluginsconf_DATA = \
     SQLite3.conf \
     Logger.conf \
     Kerneloops.conf \
-    KerneloopsScanner.conf \
-    KerneloopsReporter.conf \
     Bugzilla.conf \
     Catcut.conf \
     TicketUploader.conf \
-- 
cgit