2 files changed, 20 insertions, 6 deletions

diff --git a/debian/control b/debian/control
index 7c67a1ffa..11c52f7f9 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,17 @@ Description: Debian Live - System Build Scripts
  .
  An introduction to live-build can be found in the live-build(7) manpage.
 
+Package: live-build-cgi
+Architecture: all
+Depends: ${misc:Depends}, live-helper (= ${source:Version})
+Conflicts: live-helper (<< 2.0~a20)
+Replaces: live-helper
+Recommends: apache2 | httpd
+Description: Debian Live - System Build Scripts (cgi frontend)
+ live-build is a set of scripts to build Debian Live system images.
+ .
+ This package contains the cgi frontend.
+
 Package: live-helper
 Architecture: all
 Depends: ${misc:Depends}, live-helper
diff --git a/debian/rules b/debian/rules
index 7e5ae5aaf..36aab046a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,15 +10,18 @@ override_dh_auto_build:
 	$(MAKE) -C po update-po
 
 override_dh_auto_install:
-	dh_auto_install
-
+	$(MAKE) DESTDIR=$(CURDIR)/debian/live-build install
 	$(MAKE) -C po DESTDIR=$(CURDIR)/debian/live-build install
 
-	mv debian/live-build/usr/share/doc/live-build/ChangeLog.live-package debian/live-build/usr/share/doc/live-build/changelog.live-package
-	mv debian/live-build/usr/share/doc/live-build/ChangeLog.live-webhelper debian/live-build/usr/share/doc/live-build/changelog.live-webhelper
+	mv debian/live-build/usr/share/doc/live-helper/ChangeLog.live-package debian/live-build/usr/share/doc/live-helper/changelog.live-package
+	mv debian/live-build/usr/share/doc/live-helper/ChangeLog.live-webhelper debian/live-build/usr/share/doc/live-helper/changelog.live-webhelper
+
+	rm -f debian/live-build/usr/share/doc/live-helper/COPYING
+	rm -f debian/live-build/usr/share/doc/live-helper/ChangeLog
 
-	rm -f debian/live-build/usr/share/doc/live-build/COPYING
-	rm -f debian/live-build/usr/share/doc/live-build/ChangeLog
+	# live-buld-cgi
+	mkdir -p debian/live-build-cgi/usr/share/live-helper
+	mv debian/live-build/usr/share/live-helper/cgi debian/live-build-cgi/usr/share/live-helper
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/ChangeLog