lp:quilt

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1482. By Jean Delvare <email address hidden> on 2023-08-10

config: Update install-sh to version 2016-01-11.22

The install-sh script we ship has issues. It is not able to install
multiple files at once, and is unable to create directories when all
their parent elements do not already exist.

Update to a more recent version of that script where these issues are
fixed. Also set the executable bit so that the script can actually be
run.

This fixes bug #64430:
https://savannah.nongnu.org/bugs/index.php?64430

Signed-off-by: Jean Delvare <email address hidden>

1481. By Jean Delvare <email address hidden> on 2023-08-10

patches: Find file name with a space in unapplied patches

Fix the file name heuristic to also find quoted file names in
unapplied patches.

This fixes bug #41708:
https://savannah.nongnu.org/bugs/index.php?41708

Signed-off-by: Jean Delvare <email address hidden>

1480. By Jean Delvare <email address hidden> on 2023-08-10

diff/refresh: Quote file names which contain a space

GNU diff quotes file names which contain a space, and GNU patch
expects that as well (oddly enough, only when the patch header does
not include timestamps). Do the same so that the patches we generate
can always be applied.

Signed-off-by: Jean Delvare <email address hidden>

1479. By Jean Delvare <email address hidden> on 2023-08-10

pop: Hint at diff -z on failure

If a patch can't be removed cleanly, suggest running "quilt diff -z"
to spot the pending changes.

Signed-off-by: Jean Delvare <email address hidden>

1478. By Đoàn Trần Công Danh <email address hidden> on 2023-02-28

test: Fix a race condition in merge.test

Just like commit 4dfe7f9, (test: Fix a race condition, 2023-01-20),
this fix a test race when stdout and stderr in any order.

Signed-off-by: Đoàn Trần Công Danh <email address hidden>
Signed-off-by: Jean Delvare <email address hidden>

1477. By Jean Delvare <email address hidden> on 2023-01-20

test: Fix a race condition

The test suite does not differentiate between stdout and stderr. When
messages are printed to both, the order in which they will reach us
is apparently not guaranteed. Ideally this would be deterministic, but
until then, explicitly test stdout and stderr separately in the test
case itself. Otherwise the test suite fails randomly, which is a pain
for distribution package maintainers.

This fixes bug #63651 reported by Ross Burton:
https://savannah.nongnu.org/bugs/index.php?63651

Signed-off-by: Jean Delvare <email address hidden>

1476. By Jean Delvare <email address hidden> on 2022-12-06

backup-files: Fix hard link creation on Solaris

The ln defaults can be slightly different depending on the platform.
While on Linux 'ln' defaults to 'ln -P', on Solaris (and possibly
other platforms) it defaults to 'ln -L'.

This difference is best resolved by explicitly using the '-P' flag.

This fixes bug #63451:
  https://savannah.nongnu.org/bugs/index.php?63451
Credits to the anonymous reporter.

[JD: Propagate the fix to all occurrences of 'ln'.]

Signed-off-by: Jean Delvare <email address hidden>

1475. By Jean Delvare <email address hidden> on 2022-10-06

setup: Document the limitation of spec file support

Quilt setup can't be used on arbitrary spec files. Due to the fact
that quilt only deals with patches, every other modification to the
working tree has to happen first, and the patches must be applied
last.

This is a design limitation and not a bug, but document it so that
the users are aware of it and can adjust the %prep section of their
spec file if needed.

Signed-off-by: Jean Delvare <email address hidden>

1474. By Jean Delvare <email address hidden> on 2022-09-09

patchfns: Rename quote_re() to quote_awk_re()

Now that quote_bre() has been split into quote_re_grep() and
quote_re_sed(), rename quote_re() to quote_awk_re() for consistency.

Signed-off-by: Jean Delvare <email address hidden>

1473. By Jean Delvare <email address hidden> on 2022-09-09

Avoid warnings with grep 3.8

GNU grep version 3.8 became more strict about needless quoting in
patterns. We have one occurrence of that in quilt, where "/"
characters are being quoted by default. There are cases where they
indeed need to be quoted (typically when used in a sed s/// command)
but most of the time they do not, and this results in the following
warning:

grep: warning: stray \ before /

So rename quote_bre() to quote_sed_re(), and introduce
quote_grep_re() which does not quote "/".

Signed-off-by: Jean Delvare <email address hidden>