diff -Nru iso-scan-1.31/debian/changelog iso-scan-1.31ubuntu1/debian/changelog --- iso-scan-1.31/debian/changelog 2010-12-24 22:55:04.000000000 +0100 +++ iso-scan-1.31ubuntu1/debian/changelog 2011-01-31 18:19:08.000000000 +0100 @@ -1,3 +1,11 @@ +iso-scan (1.31ubuntu1) natty; urgency=low + + * Merge from debian unstable. (LP: #710770) Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + + -- Angel Abad Mon, 31 Jan 2011 18:10:57 +0100 + iso-scan (1.31) unstable; urgency=low [ Updated translations ] @@ -10,6 +18,14 @@ -- Otavio Salvador Fri, 24 Dec 2010 19:55:04 -0200 +iso-scan (1.30ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + + -- Colin Watson Mon, 15 Nov 2010 10:47:33 +0000 + iso-scan (1.30) unstable; urgency=low [ Updated translations ] @@ -28,6 +44,15 @@ -- Otavio Salvador Fri, 12 Nov 2010 16:06:36 -0200 +iso-scan (1.29ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + * Add natty to cdrom/suite Choices; drop jaunty. + + -- Colin Watson Fri, 15 Oct 2010 12:10:24 +0100 + iso-scan (1.29) unstable; urgency=low [ Colin Watson ] @@ -84,6 +109,26 @@ -- Christian Perrier Sun, 11 Jul 2010 13:39:58 +0200 +iso-scan (1.28ubuntu3) maverick; urgency=low + + * Add maverick to cdrom/suite Choices; drop intrepid. + + -- Colin Watson Wed, 26 May 2010 00:08:37 +0100 + +iso-scan (1.28ubuntu2) lucid; urgency=low + + * Add lucid to cdrom/suite Choices. + + -- Steve Langasek Wed, 11 Nov 2009 23:51:24 +0000 + +iso-scan (1.28ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + + -- Muharem Hrnjadovic Thu, 18 Jun 2009 12:37:39 +0200 + iso-scan (1.28) unstable; urgency=low [ Colin Watson ] @@ -134,6 +179,29 @@ -- Christian Perrier Thu, 11 Jun 2009 22:01:31 +0200 +iso-scan (1.27ubuntu3) karmic; urgency=low + + * Add karmic to cdrom/suite Choices. + * Drop gutsy from cdrom/suite Choices, since it's now unsupported. + + -- Steve Langasek Mon, 04 May 2009 05:29:41 -0700 + +iso-scan (1.27ubuntu2) jaunty; urgency=low + + * Load ext4 module if available. + + -- Colin Watson Fri, 09 Jan 2009 13:36:19 +0000 + +iso-scan (1.27ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + * Add jaunty to cdrom/suite Choices. + * Drop feisty from cdrom/suite Choices, since it's now unsupported. + + -- Colin Watson Mon, 10 Nov 2008 12:54:31 +0000 + iso-scan (1.27) unstable; urgency=low [ Updated translations ] @@ -158,6 +226,16 @@ -- Otavio Salvador Sun, 21 Sep 2008 19:06:56 -0300 +iso-scan (1.26ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + * Add intrepid to cdrom/suite Choices. + * Drop edgy from cdrom/suite Choices, since it's now unsupported. + + -- Colin Watson Thu, 12 Jun 2008 01:47:21 +0100 + iso-scan (1.26) unstable; urgency=low [ Updated translations ] @@ -221,6 +299,27 @@ -- Frans Pop Wed, 06 Feb 2008 17:30:05 +0100 +iso-scan (1.22ubuntu3) hardy; urgency=low + + * Set Vcs-Bzr for Ubuntu. + + -- Colin Watson Fri, 29 Feb 2008 18:56:04 +0000 + +iso-scan (1.22ubuntu2) hardy; urgency=low + + * Add hardy to cdrom/suite Choices. + * Drop unsupported releases from cdrom/suite Choices. + + -- Colin Watson Tue, 23 Oct 2007 15:31:13 +0100 + +iso-scan (1.22ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + + -- Colin Watson Wed, 13 Jun 2007 13:09:54 +0100 + iso-scan (1.22) unstable; urgency=low * Fix broken regexp in architecture determination code. @@ -232,6 +331,15 @@ -- Joey Hess Thu, 24 May 2007 21:29:45 -0400 +iso-scan (1.21ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + * Add gutsy to cdrom/suite choices. + + -- Colin Watson Mon, 14 May 2007 11:39:43 +0100 + iso-scan (1.21) unstable; urgency=low [ Joey Hess ] @@ -259,6 +367,23 @@ -- Frans Pop Tue, 27 Feb 2007 16:52:38 +0100 +iso-scan (1.18ubuntu2) feisty; urgency=low + + * Revert storage-core-modules dependency back to loop-modules now that its + Provides field has been fixed. + * Set Maintainer to ubuntu-installer@lists.ubuntu.com. + + -- Colin Watson Thu, 15 Mar 2007 01:10:01 +0000 + +iso-scan (1.18ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + * Depend on storage-core-modules instead of loop-modules for now. + + -- Colin Watson Tue, 13 Feb 2007 19:55:46 +0000 + iso-scan (1.18) unstable; urgency=low [ Frans Pop ] @@ -287,6 +412,15 @@ -- Frans Pop Wed, 31 Jan 2007 11:38:36 +0100 +iso-scan (1.17ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Minor Ubuntu branding. + - Update cdrom/suite choices for Ubuntu. + * Add feisty to cdrom/suite choices. + + -- Colin Watson Sat, 25 Nov 2006 13:01:11 +0000 + iso-scan (1.17) unstable; urgency=low * Sometimes udev mis-detects usb sticks as floppies. For example, this @@ -333,6 +467,20 @@ -- Colin Watson Thu, 31 Aug 2006 17:32:37 +0100 +iso-scan (1.15ubuntu2) edgy; urgency=low + + * Backport from trunk: + - Use list-devices to look for block devices. Requires di-utils 1.34. + + -- Colin Watson Fri, 1 Sep 2006 16:23:04 +0100 + +iso-scan (1.15ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + * Add edgy to cdrom/suite choices. + + -- Colin Watson Sun, 2 Jul 2006 22:45:42 +0100 + iso-scan (1.15) unstable; urgency=low * Deal with the case where the machine is so fast that iso-scan @@ -452,6 +600,14 @@ -- Frans Pop Mon, 23 Jan 2006 20:23:17 +0100 +iso-scan (1.10ubuntu1) dapper; urgency=low + + * Resynchronise with Debian. + * Add dapper to mirror/suite choices, and make it the default. + * Update mirror/suite description. + + -- Colin Watson Mon, 28 Nov 2005 20:48:39 +0000 + iso-scan (1.10) unstable; urgency=low * Also determine the codename of the release. This can be used later to @@ -503,6 +659,16 @@ -- Joey Hess Fri, 15 Jul 2005 16:54:09 +0300 +iso-scan (1.07ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + * Set mirror/suite default to breezy. + * We only really support installing the default suite, so mark + mirror/suite untranslatable. This removes two strings that are awkward + for derivatives to brand. + + -- Colin Watson Wed, 20 Jul 2005 18:48:15 +0100 + iso-scan (1.07) unstable; urgency=low [ Joey Hess ] @@ -536,6 +702,12 @@ -- Joey Hess Sat, 11 Jun 2005 13:45:33 -0400 +iso-scan (1.05ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Fri, 27 May 2005 17:32:35 +0100 + iso-scan (1.05) unstable; urgency=low * Post-sarge; needs new anna. @@ -564,6 +736,13 @@ -- Joey Hess Sun, 1 May 2005 11:04:24 -0400 +iso-scan (1.04ubuntu1) breezy; urgency=low + + * Resynchronise with Debian. + * Sync mirror/suite description with other udebs. + + -- Colin Watson Fri, 15 Apr 2005 16:13:27 +0100 + iso-scan (1.04) unstable; urgency=low * Includes fixes for substitutions in translated templates. @@ -582,6 +761,16 @@ -- Joey Hess Wed, 2 Feb 2005 18:27:48 -0500 +iso-scan (1.03ubuntu1) hoary; urgency=low + + * Minor Ubuntu branding. Left mirror/suite alone; with any luck that + template text will be overridden by one of the other copies of it in + d-i, and if not then it would be nice to find a more common place for it + to live anyway. + * Add draft Xhosa translation. + + -- Colin Watson Thu, 24 Mar 2005 10:18:05 +0000 + iso-scan (1.03) unstable; urgency=low * Updated translations: diff -Nru iso-scan-1.31/debian/control iso-scan-1.31ubuntu1/debian/control --- iso-scan-1.31/debian/control 2010-05-22 21:08:21.000000000 +0200 +++ iso-scan-1.31ubuntu1/debian/control 2010-12-25 05:00:10.000000000 +0100 @@ -1,10 +1,12 @@ Source: iso-scan Section: debian-installer Priority: optional -Maintainer: Debian Install System Team +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team Build-Depends: debhelper (>= 7.0.0) Build-Depends-Indep: dpkg-dev (>= 1.7.0) -Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/iso-scan +XS-Debian-Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/iso-scan +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/iso-scan/ubuntu Package: iso-scan XC-Package-Type: udeb diff -Nru iso-scan-1.31/debian/iso-scan.postinst iso-scan-1.31ubuntu1/debian/iso-scan.postinst --- iso-scan-1.31/debian/iso-scan.postinst 2010-02-11 21:01:36.000000000 +0100 +++ iso-scan-1.31ubuntu1/debian/iso-scan.postinst 2010-12-25 05:00:10.000000000 +0100 @@ -88,7 +88,7 @@ log "Debian ISO not usable, skipping" fi else - log "Not a Debian ISO" + log "Not an Ubuntu ISO" umount /cdrom fi else diff -Nru iso-scan-1.31/debian/iso-scan.templates iso-scan-1.31ubuntu1/debian/iso-scan.templates --- iso-scan-1.31/debian/iso-scan.templates 2009-07-23 18:59:19.000000000 +0200 +++ iso-scan-1.31ubuntu1/debian/iso-scan.templates 2010-12-25 05:00:10.000000000 +0100 @@ -6,7 +6,7 @@ Template: cdrom/suite Type: select -Choices: stable, testing, unstable +Choices: dapper, hardy, karmic, lucid, maverick, natty Description: for internal use only Suite to install