On Wed, 2015-01-28 at 06:59 +0100, Christian PERRIER wrote:
> Quoting Ian Campbell (i...@debian.org):
>
> > which removed the various symlinks for arches which share recipes.
> >
> > Looking at the source for 124 in the archive it seems like the symlinks
> > have been collapsed in the tarball (i.e. the files duplicated instead of
> > linked to), so things work but not quite as expected.
> >
> > Since I'm pretty sure it was accidental I've reverted.
>
>
> You're right. I can't track back to October 2014 the reason for this
> to happen but it was certainly an accident, for sure.
>
> Thanks for noticing and fixing this.
NP.
> Could you please add a changelog entry for this change
Done.
> and then either upload or wait for me to upload?
I went to do this, but the debdiff contained unexpected changes (see
below).
I think this can be covered by extending/changing the changelog to:
* Reinstate symlinks which were accidentally replaced with older copies of
their target files in 124. This reinstates the following which were in 123
or earlier:
- arm64, arm64-efi and i386-efi:
- Combine / and /usr partitions in 'multi' recipes (from 123).
- Increase the EFI System Partition size slightly to ensure that it's at
least 512MiB, not just 512MB (from 122).
- mipsel-cobalt:
- Remove recipes (from 116).
Which I shall commit and upload shortly.
Ian.
diff -Nru partman-auto-124/debian/changelog partman-auto-125/debian/changelog
--- partman-auto-124/debian/changelog 2014-09-27 08:45:37.000000000 +0100
+++ partman-auto-125/debian/changelog 2015-01-28 08:50:30.000000000 +0000
@@ -1,3 +1,10 @@
+partman-auto (125) unstable; urgency=medium
+
+ * Reinstate symlinks which were accidentally replaced with their target files
+ in 124.
+
+ -- Ian Campbell <i...@debian.org> Wed, 28 Jan 2015 08:50:15 +0000
+
partman-auto (124) unstable; urgency=medium
* Translations unfuzzied for /usr removal.
diff -Nru partman-auto-124/debian/po/zh_CN.po
partman-auto-125/debian/po/zh_CN.po
--- partman-auto-124/debian/po/zh_CN.po 2014-09-27 08:45:37.000000000 +0100
+++ partman-auto-125/debian/po/zh_CN.po 2015-01-28 08:50:30.000000000 +0000
@@ -39,7 +39,7 @@
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#. Type: text
diff -Nru partman-auto-124/recipes-arm64/multi
partman-auto-125/recipes-arm64/multi
--- partman-auto-124/recipes-arm64/multi 2014-09-23 21:34:34.000000000
+0100
+++ partman-auto-125/recipes-arm64/multi 2015-01-28 08:50:30.000000000
+0000
@@ -9,7 +9,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-70 800 280 $default_filesystem
+570 3000 5000 $default_filesystem
$lvmok{ }
$primary{ }
method{ format }
@@ -18,14 +18,6 @@
$default_filesystem{ }
mountpoint{ / } .
-500 3000 5000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
70 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff -Nru partman-auto-124/recipes-arm64-efi/multi
partman-auto-125/recipes-arm64-efi/multi
--- partman-auto-124/recipes-arm64-efi/multi 2014-09-23 21:34:33.000000000
+0100
+++ partman-auto-125/recipes-arm64-efi/multi 2015-01-28 08:50:30.000000000
+0000
@@ -14,7 +14,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-100 800 500 $default_filesystem
+800 7000 7000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -22,14 +22,6 @@
$default_filesystem{ }
mountpoint{ / } .
-700 7000 7000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
60 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff -Nru partman-auto-124/recipes-i386-efi/multi
partman-auto-125/recipes-i386-efi/multi
--- partman-auto-124/recipes-i386-efi/multi 2014-09-23 21:34:33.000000000
+0100
+++ partman-auto-125/recipes-i386-efi/multi 2015-01-28 08:50:30.000000000
+0000
@@ -14,7 +14,7 @@
filesystem{ ext2 }
mountpoint{ /boot } .
-100 800 500 $default_filesystem
+800 7000 7000 $default_filesystem
$lvmok{ }
method{ format }
format{ }
@@ -22,14 +22,6 @@
$default_filesystem{ }
mountpoint{ / } .
-700 7000 7000 $default_filesystem
- $lvmok{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
60 1500 3000 $default_filesystem
$lvmok{ }
method{ format }
diff -Nru partman-auto-124/recipes-mipsel-cobalt/atomic
partman-auto-125/recipes-mipsel-cobalt/atomic
--- partman-auto-124/recipes-mipsel-cobalt/atomic 2011-01-19
05:05:09.000000000 +0000
+++ partman-auto-125/recipes-mipsel-cobalt/atomic 1970-01-01
01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-partman-auto/text/atomic_scheme ::
-
-50 500 100 ext2
- $primary{ }
- $bootable{ }
- method{ format }
- format{ }
- use_filesystem{ }
- filesystem{ ext2r0 }
- mountpoint{ /boot } .
-
-500 10000 -1 $default_filesystem
- $primary{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ / } .
-
-96 512 300% linux-swap
- method{ swap }
- format{ } .
diff -Nru partman-auto-124/recipes-mipsel-cobalt/home
partman-auto-125/recipes-mipsel-cobalt/home
--- partman-auto-124/recipes-mipsel-cobalt/home 2011-01-19 05:05:09.000000000
+0000
+++ partman-auto-125/recipes-mipsel-cobalt/home 1970-01-01 01:00:00.000000000
+0100
@@ -1,30 +0,0 @@
-partman-auto/text/home_scheme ::
-
-50 500 100 ext2
- $primary{ }
- $bootable{ }
- method{ format }
- format{ }
- use_filesystem{ }
- filesystem{ ext2r0 }
- mountpoint{ /boot } .
-
-500 4000 7000 $default_filesystem
- $primary{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ / } .
-
-96 512 300% linux-swap
- method{ swap }
- format{ } .
-
-100 10000 -1 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /home } .
-
diff -Nru partman-auto-124/recipes-mipsel-cobalt/multi
partman-auto-125/recipes-mipsel-cobalt/multi
--- partman-auto-124/recipes-mipsel-cobalt/multi 2011-01-19
05:05:09.000000000 +0000
+++ partman-auto-125/recipes-mipsel-cobalt/multi 1970-01-01
01:00:00.000000000 +0100
@@ -1,51 +0,0 @@
-partman-auto/text/multi_scheme ::
-
-30 500 100 ext2
- $primary{ }
- $bootable{ }
- method{ format }
- format{ }
- use_filesystem{ }
- filesystem{ ext2r0 }
- mountpoint{ /boot } .
-
-70 800 280 $default_filesystem
- $primary{ }
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ / } .
-
-500 3000 5000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /usr } .
-
-70 1500 3000 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /var } .
-
-96 512 300% linux-swap
- method{ swap }
- format{ } .
-
-20 300 400 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /tmp } .
-
-300 3000 -1 $default_filesystem
- method{ format }
- format{ }
- use_filesystem{ }
- $default_filesystem{ }
- mountpoint{ /home } .
-
diff -Nru partman-auto-124/recipes-mipsel-cobalt/_numbers
partman-auto-125/recipes-mipsel-cobalt/_numbers
--- partman-auto-124/recipes-mipsel-cobalt/_numbers 2011-01-19
05:05:09.000000000 +0000
+++ partman-auto-125/recipes-mipsel-cobalt/_numbers 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-30 atomic
-50 home
-80 multi
--
To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1422435876.29309.24.ca...@debian.org
