[SCM] live-helper branch, debian-next, updated. debian/2.0_a19-1-4-geeda87d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 50818430f22e924d0bc929e2e69344b6b6a67cf8
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jul 24 16:15:27 2010 +0200

    Renaming live-helper package to its generic name live-build, now all Debian Live are consistently and properly named.

diff --git a/debian/control b/debian/control
index 5d3586b..7c67a1f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: live-helper
+Source: live-build
 Section: misc
 Priority: optional
 Maintainer: Debian Live Project <debian-live at lists.debian.org>
@@ -6,22 +6,34 @@ Uploaders: Daniel Baumann <daniel at debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: gettext
 Standards-Version: 3.9.0
-Homepage: http://live.debian.net/devel/live-helper/
-Vcs-Browser: http://live.debian.net/gitweb/?p=live-helper.git
-Vcs-Git: git://live.debian.net/git/live-helper.git
+Homepage: http://live.debian.net/devel/live-build/
+Vcs-Browser: http://live.debian.net/gitweb/?p=live-build.git
+Vcs-Git: git://live.debian.net/git/live-build.git
 
-Package: live-helper
+Package: live-build
 Architecture: all
 Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static
+Conflicts: live-helper (<< 2.0~a20)
+Replaces: live-helper
 Recommends: cpio, gettext-base, gnu-fdisk
 Suggests:
  dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted,
  squashfs-tools | genext2fs | mtd-tools, sudo | fakeroot, syslinux | grub,
  uuid-runtime, win32-loader
-Description: Debian Live build scripts
- live-helper is a set of scripts to build Debian Live system images.
+Description: Debian Live - System Build Scripts
+ live-build is a set of scripts to build Debian Live system images.
  .
- The idea behind live-helper is a framework that uses a configuration directory
+ The idea behind live-build is a framework that uses a configuration directory
  to completely automate and customize all aspects of building a Live image.
  .
- An introduction to live-helper can be found in the live-helper(7) manpage.
+ An introduction to live-build can be found in the live-build(7) manpage.
+
+Package: live-helper
+Architecture: all
+Depends: ${misc:Depends}, live-helper
+Description: Debian Live - System Build Scripts (transitional package)
+ Package to ease upgrading from older live-helper packages to the new
+ live-build package.
+ .
+ This package can be purged at anytime once the live-build package has been
+ installed.
diff --git a/debian/live-helper.bug-presubj b/debian/live-build.bug-presubj
similarity index 100%
rename from debian/live-helper.bug-presubj
rename to debian/live-build.bug-presubj
diff --git a/debian/live-helper.bug-script b/debian/live-build.bug-script
similarity index 100%
rename from debian/live-helper.bug-script
rename to debian/live-build.bug-script
diff --git a/debian/rules b/debian/rules
index 18ba878..7e5ae5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,13 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 
-	$(MAKE) -C po DESTDIR=$(CURDIR)/debian/live-helper install
+	$(MAKE) -C po DESTDIR=$(CURDIR)/debian/live-build install
 
-	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package
-	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-webhelper debian/live-helper/usr/share/doc/live-helper/changelog.live-webhelper
+	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
 
-	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
-	rm -f debian/live-helper/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
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/ChangeLog

-- 
live-helper