27 files changed, 33 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am
index 84a41e74..a536b7c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src retrace po icons tests
+SUBDIRS = src po icons tests
 
 DISTCHECK_CONFIGURE_FLAGS = \
         --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
diff --git a/abrt.spec b/abrt.spec
index 50c93912..43578c19 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -337,6 +337,7 @@ fi
 %{_bindir}/abrt-handle-upload
 %{_bindir}/abrt-handle-crashdump
 %{_libexecdir}/abrt-action-save-package-data
+%{_libexecdir}/abrt-retrace-client
 %config(noreplace) %{_sysconfdir}/%{name}/abrt.conf
 %config(noreplace) %{_sysconfdir}/%{name}/abrt_event.conf
 %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys
@@ -457,6 +458,8 @@ fi
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/%{name}/retrace.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/retrace_httpd.conf
+%config(noreplace) %{_sysconfdir}/yum.repos.d/retrace-local.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/retrace.repo
 %{_bindir}/abrt-retrace-reposync
 %{_bindir}/abrt-retrace-worker
 %{_datadir}/abrt-retrace/*.py*
diff --git a/configure.ac b/configure.ac
index 58996326..8436c34e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,15 +127,10 @@ AC_CONFIG_FILES([
 	src/applet/Makefile
 	src/gui/Makefile
 	src/cli/Makefile
+	src/retrace/Makefile
 	po/Makefile.in
 	icons/Makefile
 	tests/btparser/Makefile
-	retrace/Makefile
-	retrace/config/Makefile
-	retrace/interface/Makefile
-	retrace/lib/Makefile
-	retrace/reposync/Makefile
-	retrace/worker/Makefile
 ])
 
 AC_OUTPUT
diff --git a/retrace/Makefile.am b/retrace/Makefile.am
deleted file mode 100644
index d2e965aa..00000000
--- a/retrace/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = config interface lib reposync worker
diff --git a/retrace/config/Makefile.am b/retrace/config/Makefile.am
deleted file mode 100644
index 756802ee..00000000
--- a/retrace/config/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-repo_DATA = retrace.repo retrace-local.repo
-repodir = ${sysconfdir}/yum.repos.d
-
-retraceconf_DATA = retrace.conf
-retraceconfdir = ${sysconfdir}/abrt
-
-httpdconf_DATA = retrace_httpd.conf
-httpdconfdir = ${sysconfdir}/httpd/conf.d
-
-EXTRA_DIST = retrace.conf retrace_httpd.conf retrace.repo retrace-local.repo
-
-# Apache config files can be owned by root, httpd just needs read
-# access.
-#install-data-hook:
-#	chown apache:apache $(DESTDIR)$(httpdconfdir)/retrace_httpd.conf
diff --git a/retrace/interface/Makefile.am b/retrace/interface/Makefile.am
deleted file mode 100644
index 23589fa3..00000000
--- a/retrace/interface/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-interface_PYTHON = backtrace.wsgi create.wsgi log.wsgi status.wsgi
-# interfacedir should probably be $$(pkgdatadir)/retrace
-interfacedir =  $(datadir)/abrt-retrace
diff --git a/retrace/lib/Makefile.am b/retrace/lib/Makefile.am
deleted file mode 100644
index 4002ddb4..00000000
--- a/retrace/lib/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-retrace_PYTHON = retrace.py
-retracedir = $(datadir)/abrt-retrace
diff --git a/retrace/reposync/Makefile.am b/retrace/reposync/Makefile.am
deleted file mode 100644
index 3770d395..00000000
--- a/retrace/reposync/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-dist_bin_SCRIPTS=abrt-retrace-reposync
diff --git a/retrace/worker/Makefile.am b/retrace/worker/Makefile.am
deleted file mode 100644
index 269bd9b0..00000000
--- a/retrace/worker/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-bin_PROGRAMS = abrt-retrace-worker
-
-abrt_retrace_worker_SOURCES = worker.c
diff --git a/src/Makefile.am b/src/Makefile.am
index fb4cba28..e42f1aec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = include lib hooks btparser daemon applet gui cli plugins
+SUBDIRS = include lib hooks btparser daemon applet gui cli plugins retrace
diff --git a/src/retrace/Makefile.am b/src/retrace/Makefile.am
new file mode 100644
index 00000000..887466eb
--- /dev/null
+++ b/src/retrace/Makefile.am
@@ -0,0 +1,27 @@
+bin_PROGRAMS = abrt-retrace-worker
+abrt_retrace_worker_SOURCES = worker.c
+
+dist_bin_SCRIPTS=abrt-retrace-reposync
+
+retrace_PYTHON = retrace.py
+retracedir = $(datadir)/abrt-retrace
+
+interface_PYTHON = backtrace.wsgi create.wsgi log.wsgi status.wsgi
+# interfacedir should probably be $$(pkgdatadir)/retrace
+interfacedir =  $(datadir)/abrt-retrace
+
+repo_DATA = retrace.repo retrace-local.repo
+repodir = ${sysconfdir}/yum.repos.d
+
+retraceconf_DATA = retrace.conf
+retraceconfdir = ${sysconfdir}/abrt
+
+httpdconf_DATA = retrace_httpd.conf
+httpdconfdir = ${sysconfdir}/httpd/conf.d
+
+EXTRA_DIST = retrace.conf retrace_httpd.conf retrace.repo retrace-local.repo
+
+# Apache config files can be owned by root, httpd just needs read
+# access.
+#install-data-hook:
+#       chown apache:apache $(DESTDIR)$(httpdconfdir)/retrace_httpd.conf
diff --git a/retrace/worker/abrt-retrace-cleanup.py b/src/retrace/abrt-retrace-cleanup.py
index 9286889f..9286889f 100755
--- a/retrace/worker/abrt-retrace-cleanup.py
+++ b/src/retrace/abrt-retrace-cleanup.py
diff --git a/retrace/reposync/abrt-retrace-reposync b/src/retrace/abrt-retrace-reposync
index 0e75a7e1..0e75a7e1 100755
--- a/retrace/reposync/abrt-retrace-reposync
+++ b/src/retrace/abrt-retrace-reposync
diff --git a/retrace/interface/backtrace.wsgi b/src/retrace/backtrace.wsgi
index d6a8686a..d6a8686a 100644
--- a/retrace/interface/backtrace.wsgi
+++ b/src/retrace/backtrace.wsgi
diff --git a/retrace/worker/coredump2packages.py b/src/retrace/coredump2packages.py
index ac2db9f2..ac2db9f2 100755
--- a/retrace/worker/coredump2packages.py
+++ b/src/retrace/coredump2packages.py
diff --git a/retrace/interface/create.wsgi b/src/retrace/create.wsgi
index 1c560d45..1c560d45 100644
--- a/retrace/interface/create.wsgi
+++ b/src/retrace/create.wsgi
diff --git a/retrace/install.sh b/src/retrace/install.sh
index ca88a1ec..ca88a1ec 100755
--- a/retrace/install.sh
+++ b/src/retrace/install.sh
diff --git a/retrace/interface/log.wsgi b/src/retrace/log.wsgi
index bc20a98b..bc20a98b 100644
--- a/retrace/interface/log.wsgi
+++ b/src/retrace/log.wsgi
diff --git a/retrace/config/retrace-local.repo b/src/retrace/retrace-local.repo
index fb079ca5..fb079ca5 100644
--- a/retrace/config/retrace-local.repo
+++ b/src/retrace/retrace-local.repo
diff --git a/retrace/config/retrace.conf b/src/retrace/retrace.conf
index e97e7cfc..e97e7cfc 100644
--- a/retrace/config/retrace.conf
+++ b/src/retrace/retrace.conf
diff --git a/retrace/lib/retrace.py b/src/retrace/retrace.py
index 1c741ec7..1c741ec7 100644
--- a/retrace/lib/retrace.py
+++ b/src/retrace/retrace.py
diff --git a/retrace/config/retrace.repo b/src/retrace/retrace.repo
index 19c409e2..19c409e2 100644
--- a/retrace/config/retrace.repo
+++ b/src/retrace/retrace.repo
diff --git a/retrace/config/retrace_httpd.conf b/src/retrace/retrace_httpd.conf
index b896f86f..b896f86f 100644
--- a/retrace/config/retrace_httpd.conf
+++ b/src/retrace/retrace_httpd.conf
diff --git a/retrace/interface/status.wsgi b/src/retrace/status.wsgi
index eb153b05..eb153b05 100644
--- a/retrace/interface/status.wsgi
+++ b/src/retrace/status.wsgi
diff --git a/retrace/test-uploader/upload.py b/src/retrace/test-uploader.py
index db75da16..db75da16 100755
--- a/retrace/test-uploader/upload.py
+++ b/src/retrace/test-uploader.py
diff --git a/retrace/worker/worker.c b/src/retrace/worker.c
index 2020627d..2020627d 100644
--- a/retrace/worker/worker.c
+++ b/src/retrace/worker.c
diff --git a/retrace/worker/worker.py b/src/retrace/worker.py
index 4b56c992..4b56c992 100755
--- a/retrace/worker/worker.py
+++ b/src/retrace/worker.py