[Debian-live-changes] r2590 - dists/trunk/live-helper/debian

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-07-27 07:38:24 +0000 (Fri, 27 Jul 2007)
New Revision: 2590

Modified:
   dists/trunk/live-helper/debian/control
   dists/trunk/live-helper/debian/rules
Log:


Modified: dists/trunk/live-helper/debian/control
===================================================================
--- dists/trunk/live-helper/debian/control	2007-07-27 07:38:01 UTC (rev 2589)
+++ dists/trunk/live-helper/debian/control	2007-07-27 07:38:24 UTC (rev 2590)
@@ -12,9 +12,6 @@
 Architecture: all
 Depends: cdebootstrap (>= 0.3.15) | debootstrap (>= 0.3.3.2)
 Suggests: genisoimage | mkisofs, memtest86+ | memtest86, mtools, squashfs-tools | genext2fs, syslinux | grub
-Conflicts: live-package
-Replaces: live-package
-Provides: make-live
 Description: Debian Live helper programs
  Live-helper is a collection of programs that can be used to build Debian Live
  system images. The philosophy behind live-helper is to provide a collection of

Modified: dists/trunk/live-helper/debian/rules
===================================================================
--- dists/trunk/live-helper/debian/rules	2007-07-27 07:38:01 UTC (rev 2589)
+++ dists/trunk/live-helper/debian/rules	2007-07-27 07:38:24 UTC (rev 2590)
@@ -29,6 +29,10 @@
 
 	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
 
+	# Preparing alternatives
+	mv debian/live-helper/usr/share/live-helper/includes debian/live-helper/usr/share/live-helper/includes.debian
+	mv debian/live-helper/usr/share/live-helper/templates debian/live-helper/usr/share/live-helper/templates.debian
+
 	# Removing double files
 	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
 	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog