Adding debian version 3.0~a1-1.

8 files changed, 124 insertions, 311 deletions

diff --git a/debian/changelog b/debian/changelog
index 23a1ffe14..2c6bd326c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,253 +1,9 @@
-live-build (2.0.12-2) unstable; urgency=low
+live-build (3.0~a1-1) experimental; urgency=low
 
-  * Adding preinst script to remove
-    /usr/share/live/build/includes/squeeze (Closes: #611794).
+  * Removing lenny support.
+  * Switching to source format 3.0 (quilt).
 
- -- Daniel Baumann <daniel@debian.org>  Wed, 02 Feb 2011 12:35:41 +0100
-
-live-build (2.0.12-1) unstable; urgency=low
-
-  [ Daniel Baumann ]
-  * Removing l10n support for 2.0 branch.
-  * Correcting outdated program variable.
-  * Updating help function in lb for live-build.
-  * Updating man function for newer live-build versions (Closes:
-    #608477).
-  * Marking xresprobe in standard-x11 list as lenny only (Closes:
-    #608566).
-  * Updating year in copyright.
-  * Removing headers in copyright file.
-  * Updating year in manpage, hooks, script and template files.
-
-  [ Luigi Capriotti ]
-  * Support for newer grub-common package.
-
-  [ Daniel Baumann ]
-  * Simplyfing grub-mkimage legacy handling for lenny in lb_binary_iso.
-  * Adding ubuntu lucid for grub-mkimage legacy handling in
-    lb_binary_iso.
-  * Adding missing netinst udeb include files for ubuntu.
-
-  [ Cody A.W. Somerville ]
-  * Adding missing debian-cd data files for Ubuntu releases for some
-    architectures.
-
-  [ Daniel Baumann ]
-  * Adding support for Ubuntu jaunty and natty, thanks to Cody A.W.
-    Somerville <cody.somerville@canonical.com>.
-
-  [ Philip Newborough ]
-  * Update example path in 'all_binary_debian-installer-banner.sh'
-    example hook.
-
-  [ Daniel Baumann ]
-  * Account for the + character in packages for l-b.cgi
-  * Updating includes for squeeze.
-  * Updating syslinux theme for squeeze.
-  * Removing wheezy splash.
-
- -- Daniel Baumann <daniel@debian.org>  Tue, 01 Feb 2011 22:32:56 +0100
-
-live-build (2.0.11-1) unstable; urgency=low
-
-  [ Daniel Baumann ]
-  * Disabling inclusion of GUI installer images on ubuntu.
-  * Updating losetup-lukshome example hook to use blkid where available,
-    thanks to Clint Adams <clint@gnu.org> (Closes: #607108).
-
-  [ Cody A.W. Somerville ]
-  * Fixing numbering of live kernels and initrd files when using
-    syslinux.
-
-  [ Daniel Baumann ]
-  * Removing unmaintained package lists (Closes: #598100).
-
- -- Daniel Baumann <daniel@debian.org>  Fri, 24 Dec 2010 18:49:26 +0100
-
-live-build (2.0.10-1) unstable; urgency=low
-
-  [ Ben Armstrong ]
-  * Adding '--includes none' documentation in help and man page.
-
-  [ Daniel Baumann ]
-  * Marking afio in rescue list as sid and lenny only.
-  * Adding debian-installer-launcher in prebuilt images.
-
-  [ Ben Armstrong ]
-  * Fixing numerous spelling and other minor details in lb_config man
-    page.
-  * Adding *-desktop virtual package lists files (just comments for doc
-    purposes).
-
-  [ Daniel Baumann ]
-  * Adding debian-cd data for ubuntu releases.
-  * Removing old ubuntu release (jaunty).
-  * Applying patch from Cody A.W. Somerville
-    <cody.somerville@canonical.com> to update kernel packages for ubuntu
-    in lb_binary_debian-installer.
-  * Removing last live-helper remains in internal variables.
-  * Removing old and outdated FAQ.
-  * Mentioning Richard in authors file.
-  * Updating credits file.
-  * Removing unused name header in package lists.
-  * Unfuzzying German manpage translations.
-  * Marking ntop as lenny and sid only in rescue list.
-  * Marking tob as lenny and sid only in rescue list.
-
- -- Daniel Baumann <daniel@debian.org>  Tue, 14 Dec 2010 13:05:39 +0100
-
-live-build (2.0.9-1) unstable; urgency=medium
-
-  [ Daniel Baumann ]
-  * Once again updating volatile urls for squeeze.
-
-  [ Ben Armstrong ]
-  * Updating lb config --help and man page.
-
-  [ Daniel Baumann ]
-  * Unfuzzying German manpage translations.
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 06 Dec 2010 12:01:43 +0100
-
-live-build (2.0.8-1) unstable; urgency=medium
-
-  [ Daniel Baumann ]
-  * Replacing last occurences of lh with lb.
-  * Adding warning about non-usefullnes of the stripped hook.
-
-  [ Ben Armstrong ]
-  * Adding example auto scripts.
-
-  [ Daniel Baumann ]
-  * Applying slightly modified patch from Michael Hudson
-    <michael.hudson@canonical.com> to make arguments in debootstrap
-    calls more robust.
-  * Updating initramfs switch in lb config manpage (Closes: #605255).
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 29 Nov 2010 23:12:54 +0100
-
-live-build (2.0.7-1) unstable; urgency=medium
-
-  [ Daniel Baumann ]
-  * Enabling volatile for squeeze.
-  * Updating volatile urls for squeeze.
-
-  [ Richard Nelson ]
-  * Cleanup l-b.cgi header file to reflect Live Build.
-
-  [ Daniel Baumann ]
-  * Removing apt-mirror-setup from udeb_exclude (Closes: #604027).
-  * Removing cdrom-detect/try-usb workaround, not needed anymore.
-  * Correcting quoting of auto calls, thanks to Andreas Loibl
-    <andreas@andreas-loibl.de>.
-  * Also including auxiliary packages in d-i pool (Closes: #604551).
-  * Enabling removal of ssh host keys, they are regenerated by live-
-    config.
-  * Simplyfing ssh host key removal.
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 22 Nov 2010 23:13:43 +0100
-
-live-build (2.0.6-1) unstable; urgency=medium
-
-  [ Ben Armstrong ]
-  * Adding reference material to debian-live-devel list: live-boot,
-    live-config and live-manual.
-
-  [ Daniel Baumann ]
-  * Adding vpnc in rescue list.
-  * Updating debian-live-devel packages list (Closes: #602139).
-  * Correcting typo in defaults handling of apt http proxy.
-  * Workarounding symlink on usb-hdd when including debian-installer and
-    using vfat filesystems.
-
-  [ Ben Armstrong ]
-  * Fixing typo in symlink on fat workaround.
-
-  [ Daniel Baumann ]
-  * Making d-i indices copying depending on binary image type.
-
- -- Daniel Baumann <daniel@debian.org>  Sat, 13 Nov 2010 16:10:43 +0100
-
-live-build (2.0.5-1) unstable; urgency=medium
-
-  * Removing dpkg-tmpfs hack, this is too intrusive atm.
-
- -- Daniel Baumann <daniel@debian.org>  Thu, 28 Oct 2010 09:44:14 +0200
-
-live-build (2.0.4-1) unstable; urgency=medium
-
-  [ Richard Nelson ]
-  * Addng lenny build option back to forms and removing wheezy on l-b-
-    cgi.
-
-  [ Daniel Baumann ]
-  * Adding fsarchiver to rescue list.
-  * Removing deep link to bug page in the manual, since we don't have
-    stable references yet.
-
- -- Daniel Baumann <daniel@debian.org>  Thu, 28 Oct 2010 09:34:43 +0200
-
-live-build (2.0.3-1) unstable; urgency=medium
-
-  [ Daniel Baumann ]
-  * Removing cron examples, autobuild is handled by live-autobuild now.
-  * Using old lenny syslinux bootsplash for squeeze, moving new splash
-    to wheezy.
-
-  [ Richard Nelson ]
-  * Make iso-hybrid default on l-b-cgi.
-  * Make squeeze default on l-b-cgi.
-
-  [ Daniel Baumann ]
-  * Updating path in copyright file.
-  * Removing remaining last leftovers from lh in lb and live-build
-    manpages.
-  * Removing debian-maintainers.org and debian-projects.org repository
-    entries, will re-add them after squeeze.
-  * Updating special handling for backports.
-
- -- Daniel Baumann <daniel@debian.org>  Tue, 12 Oct 2010 11:05:07 +0200
-
-live-build (2.0.2-1) unstable; urgency=medium
-
-  [ Daniel Baumann ]
-  * Removing superfluous 'releasing' changelog entry in previous
-    version.
-  * Updating defaults for squeeze and d-i gui.
-  * Updating images autobuild script for squeeze beta1.
-  * Adding temporary workarounds to deal with latest archive breakages
-    in image autobuild script.
-  * Handling live.debian.net repository differently, so that ubuntu
-    people can use it too.
-  * Marking mrt in rescue list as lenny only.
-  * Also using gdm legacy hack on xfce-desktop default images.
-
-  [ intrigeri ]
-  * Fixing squashfs.sort location with --build-with-chroot false.
-
-  [ Daniel Baumann ]
-  * Correcting typo with lb config call for usb-hdd in autobuild script.
-
- -- Daniel Baumann <daniel@debian.org>  Sat, 02 Oct 2010 10:00:45 +0200
-
-live-build (2.0.1-1) unstable; urgency=medium
-
-  [ Daniel Baumann ]
-  * Adding squeeze-backports as valid distribution codename in
-    lb_config.
-  * Correcting wrong stage file in lb_chroot_interactive.
-  * Removing d-i hacks, should be fixed with newer live-installer.
-
-  [ Otavio Salvador ]
-  * Fixing debian-installer index generation.
-  * Fixing debian-installer Release file generation.
-
-  [ Daniel Baumann ]
-  * Also correcting version number in debian-installer release file.
-  * Avoid using bashism when handling codename/suite mapping for debian-
-    installer release file.
-
- -- Daniel Baumann <daniel@debian.org>  Mon, 27 Sep 2010 07:41:45 +0200
+ -- Daniel Baumann <daniel@debian.org>  Sun, 26 Sep 2010 12:38:28 +0200
 
 live-build (2.0.0-1) unstable; urgency=medium
 
@@ -283,6 +39,7 @@ live-build (2.0.0-1) unstable; urgency=medium
     finally migrated some time ago.
   * Not fail if /dev/random is not available in chroot, newer
     debootstrap seems not to create it anymore.
+  * Releasing debian version 2.0.0-1.
 
  -- Daniel Baumann <daniel@debian.org>  Sun, 26 Sep 2010 12:14:46 +0200
 
diff --git a/debian/control b/debian/control
index 0e2cde43c..fae32f93a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Debian Live Project <debian-live@lists.debian.org>
 Uploaders: Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends-Indep: gettext
 Standards-Version: 3.9.1
 Homepage: http://live.debian.net/devel/live-build/
 Vcs-Browser: http://live.debian.net/gitweb/?p=live-build.git
@@ -12,9 +13,7 @@ Vcs-Git: git://live.debian.net/git/live-build.git
 Package: live-build
 Architecture: all
 Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static
-Conflicts: live-helper (<< 2.0~a20)
-Replaces: live-helper
-Recommends: cpio, gnu-fdisk
+Recommends: cpio, gettext-base, gnu-fdisk
 Suggests:
  dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted,
  squashfs-tools | genext2fs | mtd-tools, sudo | fakeroot, syslinux | grub,
@@ -25,22 +24,10 @@ Description: Debian Live - System Build Scripts
 
 Package: live-build-cgi
 Architecture: all
-Depends: ${misc:Depends}, live-helper (= ${source:Version})
-Conflicts: live-helper (<< 2.0~a20)
-Replaces: live-helper
+Depends: ${misc:Depends}
 Recommends: apache2 | httpd
 Description: Debian Live - System Build Scripts (cgi frontend)
  live-build contains the scripts that build a Debian Live system image from a
  configuration directory.
  .
  This package contains the cgi frontend.
-
-Package: live-helper
-Architecture: all
-Depends: ${misc:Depends}, live-build
-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/copyright b/debian/copyright
index a4a985531..58bc04708 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,8 @@
+Upstream-Contact: Debian Live Project <debian-live@lists.debian.org>
+Upstream-Homepage: http://live.debian.net/
+
 Files: *
-Copyright: (C) 2006-2011 Daniel Baumann <daniel@debian.org>
+Copyright: (C) 2006-2010 Daniel Baumann <daniel@debian.org>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -65,21 +68,109 @@ License: other
  http://www.debian.org/ if you use it on a web page.
 
 Files: contrib/syslinux-splash/squeeze
-Copyright: (C) 2010 2010 Valessio S. Brito
-License: GPL-2
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; version 2
- of the License.
+Copyright: (C) 2009 Agnieszka Czajkowska <ac@ac-d-sign.com>
+License: CC-BY-SA-3
+ Creative Commons Attribution-ShareAlike 3.0 Unported
+ ====================================================
  .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
  .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ --------------------------------------------------------------------------------
  .
- On Debian systems, the complete text of the GNU General Public License
- can be found in /usr/share/common-licenses/GPL-2 file.
+ License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+ .
+ 1. Definitions
+ .
+   a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+ .
+   b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+ .
+   c. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+ .
+   d. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+ .
+   e. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+ .
+   f. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+ .
+   g. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+ .
+   h. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+ .
+   i. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+ .
+   j. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+ .
+   k "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+ .
+   a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+ .
+   b. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+ .
+   c. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+ .
+   d. to Distribute and Publicly Perform Adaptations.
+ .
+   e. For the avoidance of doubt:
+ .
+      i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+ .
+      ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+ .
+     iii. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+ .
+   The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+ .
+   a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+ .
+   b. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+ .
+   c. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+ .
+   d. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+   a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+ .
+   b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+ .
+ 8. Miscellaneous
+ .
+   a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+ .
+   b. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+ .
+   c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+ .
+   d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+ .
+   e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+ .
+   f. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
+ .
+ --------------------------------------------------------------------------------
+ .
+ Creative Commons Notice
+ .
+ Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.
+ .
+ Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License.
+ .
+ Creative Commons may be contacted at http://creativecommons.org/.
diff --git a/debian/live-build.bug-presubj b/debian/live-build.bug-presubj
index 3c9a0b00e..b019b1580 100644
--- a/debian/live-build.bug-presubj
+++ b/debian/live-build.bug-presubj
@@ -1,7 +1,7 @@
 Before submitting a bug report against live-build, please make sure
 that you have read your guidlines for Debian Live bug reports:
 
-  http://live.debian.net/manual/
+  http://live.debian.net/manual/html/bugs.html
 
 By providing the required information as outlined in the guidlines makes
 sure that we can optimally reproduce and fix bugs, not doing so wastes a
diff --git a/debian/live-build.preinst b/debian/live-build.preinst
deleted file mode 100644
index 1d53a0a0f..000000000
--- a/debian/live-build.preinst
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	upgrade)
-		if [ -h /usr/share/live/build/includes/squeeze ]
-		then
-			rm -f /usr/share/live/build/includes/squeeze
-		fi
-		;;
-
-	install|abort-upgrade)
-
-			;;
-
-	*)
-		echo "preinst called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/live-helper.links b/debian/live-helper.links
deleted file mode 100644
index 691e14a62..000000000
--- a/debian/live-helper.links
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/bin/lb				/usr/bin/lh
-/usr/share/man/man1/lb.1.gz		/usr/share/man/man1/lh.1.gz
-/usr/bin/live-build			/usr/bin/live-helper
-/usr/share/man/man7/live-build.7.gz	/usr/share/man/man7/live-helper.7.gz
diff --git a/debian/rules b/debian/rules
index ea8565100..6a24cd52c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,15 @@
 %:
 	dh ${@}
 
+override_dh_auto_clean:
+	$(MAKE) -C po clean
+
+override_dh_auto_build:
+	$(MAKE) -C po update-po
+
 override_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
diff --git a/debian/source/format b/debian/source/format
index d3827e75a..163aaf8d8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)