diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2020-06-24 17:04:44 +0200 |
|---|---|---|
| committer | Salvatore Bonaccorso <carnil@debian.org> | 2020-06-24 17:04:44 +0200 |
| commit | 9ff9c2e5856ae0f85e2c1b79d6ce06e54f297414 (patch) | |
| tree | 323b7afc7399c9bf799b8bfa440af53f3245af64 | |
| parent | 8aa17aa03eb31baf97cf4daf687441b796fff2f5 (diff) | |
| parent | 5785c0b6371bedacee1c8c52397ba7aafdc6191b (diff) | |
| download | kernel_replicant_linux-9ff9c2e5856ae0f85e2c1b79d6ce06e54f297414.tar.gz kernel_replicant_linux-9ff9c2e5856ae0f85e2c1b79d6ce06e54f297414.tar.bz2 kernel_replicant_linux-9ff9c2e5856ae0f85e2c1b79d6ce06e54f297414.zip | |
Merge branch 'sid'
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/templates/docs.meta.maintscript.in | 2 | ||||
| -rw-r--r-- | debian/templates/headers.meta.maintscript.in | 2 | ||||
| -rw-r--r-- | debian/templates/image-dbg.meta.maintscript.in | 2 | ||||
| -rw-r--r-- | debian/templates/image.meta.maintscript.in | 2 | ||||
| -rw-r--r-- | debian/templates/perf.meta.maintscript.in | 2 | ||||
| -rw-r--r-- | debian/templates/sourcebin.meta.maintscript.in | 2 |
7 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index e98ab9bf5a17..d230ac2522aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ linux (5.7.5-1~exp1) UNRELEASED; urgency=medium [ Ben Hutchings ] * fs: Enable EXFAT_FS as module (Closes: #959781) + * Fix conversion of meta-package doc directories to symlinks + (Closes: #942861) [ Vagrant Cascadian ] * [arm64] Enable DRM_ANALOGIX_ANX6345 as a module. diff --git a/debian/templates/docs.meta.maintscript.in b/debian/templates/docs.meta.maintscript.in index 82bac33e0d18..be9cf59f0de0 100644 --- a/debian/templates/docs.meta.maintscript.in +++ b/debian/templates/docs.meta.maintscript.in @@ -1 +1 @@ -dir_to_symlink /usr/share/doc/@source_basename@-doc@source_suffix@ @source_basename@-doc-@version@ 5.2+107 @source_basename@-doc@source_suffix@ +dir_to_symlink /usr/share/doc/@source_basename@-doc@source_suffix@ @source_basename@-doc-@version@ 5.7~rc5-1~exp1 @source_basename@-doc@source_suffix@ diff --git a/debian/templates/headers.meta.maintscript.in b/debian/templates/headers.meta.maintscript.in index ae49c58ba404..e1f2662cb489 100644 --- a/debian/templates/headers.meta.maintscript.in +++ b/debian/templates/headers.meta.maintscript.in @@ -1 +1 @@ -dir_to_symlink /usr/share/doc/linux-headers@source_suffix@@localversion@ linux-headers-@abiname@@localversion@ 5.2+107 linux-headers@source_suffix@@localversion@ +dir_to_symlink /usr/share/doc/linux-headers@source_suffix@@localversion@ linux-headers-@abiname@@localversion@ 5.7~rc5-1~exp1 linux-headers@source_suffix@@localversion@ diff --git a/debian/templates/image-dbg.meta.maintscript.in b/debian/templates/image-dbg.meta.maintscript.in index 951e5554df96..f09fd9d76ca1 100644 --- a/debian/templates/image-dbg.meta.maintscript.in +++ b/debian/templates/image-dbg.meta.maintscript.in @@ -1 +1 @@ -dir_to_symlink /usr/share/doc/linux-image@source_suffix@@localversion@-dbg linux-image-@abiname@@localversion@-dbg 5.2+107 linux-image@source_suffix@@localversion@-dbg +dir_to_symlink /usr/share/doc/linux-image@source_suffix@@localversion@-dbg linux-image-@abiname@@localversion@-dbg 5.7~rc5-1~exp1 linux-image@source_suffix@@localversion@-dbg diff --git a/debian/templates/image.meta.maintscript.in b/debian/templates/image.meta.maintscript.in index ae14d600871e..76244f382403 100644 --- a/debian/templates/image.meta.maintscript.in +++ b/debian/templates/image.meta.maintscript.in @@ -1 +1 @@ -dir_to_symlink /usr/share/doc/linux-image@source_suffix@@localversion@ linux-image-@abiname@@localversion@ 5.2+107 linux-image@source_suffix@@localversion@ +dir_to_symlink /usr/share/doc/linux-image@source_suffix@@localversion@ linux-image-@abiname@@localversion@ 5.7~rc5-1~exp1 linux-image@source_suffix@@localversion@ diff --git a/debian/templates/perf.meta.maintscript.in b/debian/templates/perf.meta.maintscript.in index e62de9945759..cbdb955620c6 100644 --- a/debian/templates/perf.meta.maintscript.in +++ b/debian/templates/perf.meta.maintscript.in @@ -1 +1 @@ -dir_to_symlink /usr/share/doc/linux-perf linux-perf-@version@ 5.2+107 linux-perf +dir_to_symlink /usr/share/doc/linux-perf linux-perf-@version@ 5.7~rc5-1~exp1 linux-perf diff --git a/debian/templates/sourcebin.meta.maintscript.in b/debian/templates/sourcebin.meta.maintscript.in index 0546da9c0ce8..3943321b8ed0 100644 --- a/debian/templates/sourcebin.meta.maintscript.in +++ b/debian/templates/sourcebin.meta.maintscript.in @@ -1 +1 @@ -dir_to_symlink /usr/share/doc/@source_basename@-source@source_suffix@ @source_basename@-source-@version@ 5.2+107 @source_basename@-source@source_suffix@ +dir_to_symlink /usr/share/doc/@source_basename@-source@source_suffix@ @source_basename@-source-@version@ 5.7~rc5-1~exp1 @source_basename@-source@source_suffix@ |