commit 555f47e76854a656905815273bee20f6aad22999 Merge: 9f6e701 780d5d6 Author: Santiago R.R. <santiago@debian.org> Date: Fri Aug 22 16:05:04 2025 -0300 Merge branch 'fix-copyright' into 'debian/master' Fix copyright file formatting to follow copyright-format 1.0 See merge request debian/grep!17 commit 780d5d6f9bc09b0e0561cf2cc12c445da0358416 Author: Otto Kekäläinen <otto@debian.org> Date: Wed Aug 20 21:26:08 2025 -0700 Update copyright with Debian maintainers commit 763d8c192666bf734cfc455392e7dce3808f594a Author: Otto Kekäläinen <otto@debian.org> Date: Wed Aug 20 19:08:31 2025 -0700 Extend copyright with detailed GPL variants information Even though grep as a whole is GPL-3+, it includes files that on their own also allow other GPL variants. Document these to satisfy `lrc`. With these changes the `debian/copyright` is finally `lrc` clean. commit e2002c60e9437b904b9b7e8794543f4c430cb4ef Author: Otto Kekäläinen <otto@debian.org> Date: Wed Aug 20 19:02:55 2025 -0700 Extend copyright with references to all licenses found in sources This is done in a separate commit to clearly show what files were found to have a non-GPL-3+ license. commit d5d4f4025c9dc3116cd0252bd88b3516e27cc2cd Author: Otto Kekäläinen <otto@debian.org> Date: Wed Aug 20 18:45:02 2025 -0700 Fix copyright file formatting to follow copyright-format 1.0 - Source-line needs to use two spaces for continuation - Files should be listed on separate lines - Clean away excess timestamp See https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ If the file formatting is not correct, it may confuse the copyright scanning tools as potentially happened in Bug#1111676. commit 9f6e70143249f6c92fb7158a74d288332e132df4 Merge: ea42f3a 318079e Author: Santiago R.R. <santiago@debian.org> Date: Tue Oct 22 22:39:17 2024 +0000 Merge branch 'merge-3.11-4' into 'debian/master' Update debian/master with debian/3.11-4 See merge request debian/grep!16 commit 318079ec1ced60808f4fd17c89e3e71d8c0e038f Merge: c62b3d2 ea42f3a Author: Santiago Ruano Rincón <santiagorr@riseup.net> Date: Tue Oct 22 19:02:51 2024 -0300 Merge remote-tracking branch 'origin/debian/master' into debian/master commit c62b3d227160c7bce9e6d3330b14d71633b6b1ed Merge: 6a1f015 3eb401b Author: Santiago Ruano Rincón <santiagorr@riseup.net> Date: Tue Oct 22 18:58:36 2024 -0300 Merge tag 'debian/3.11-4' into debian/master grep Debian release 3.11-4 commit ea42f3a2b94ff67c4f0baff4c6407d780250b882 Merge: 6a1f015 8f4e7a6 Author: Santiago R.R. <santiago@debian.org> Date: Mon Sep 23 14:03:25 2024 +0000 Merge branch 'salsa-ci-fixes' into 'debian/master' Salsa CI: Enforce `wrap-and-sort -ast` See merge request debian/grep!15 commit 8f4e7a629b3bf417979864103f995ae8d51cbb55 Author: Otto Kekäläinen <otto@debian.org> Date: Sun Sep 22 17:16:31 2024 -0700 Wrap-and-sort debian/ with -ast Using latest version of devscripts in Debian unstable. The same result comes also from running `debputy reformat --style black`. Do not update debian/changelog as this change is already in mentioned, it is irrelevant to have documented that it actually happened twice. Gbp-Dch: Ignore commit dfc2122fad831ff6f7f3a3ded4d266ec8632e634 Author: Otto Kekäläinen <otto@debian.org> Date: Sun Sep 22 17:16:47 2024 -0700 Salsa CI: Enforce `wrap-and-sort -ast` The source code of `grep` is used for testing regressions in Salsa CI, which includes the use or wrap-and-sort. Ensure grep source code always uses it so that it won't regress Salsa CI regression testing. Gbp-Dch: Ignore commit 6a1f01528352310003a6a81184a83ae5ae6a9a95 Merge: d5f0492 4a67a72 Author: Santiago R.R. <santiago@debian.org> Date: Wed Mar 13 17:44:02 2024 +0000 Merge branch 'wrap-and-sort' into 'debian/master' Wrap-and-sort debian/ with -ast See merge request debian/grep!14 commit 4a67a72497afbda26ed6c6fd4583c549810869e5 Author: Santiago Ruano Rincón <santiagorr@riseup.net> Date: Wed Mar 13 14:31:26 2024 -0300 Snapshot debian/changelog Gbp-Dch: Ignore commit be0243e401b60bc93a70dde7af0d8bce510e9b24 Author: Santiago Ruano Rincón <santiagorr@riseup.net> Date: Wed Mar 13 14:23:55 2024 -0300 Wrap-and-sort debian/ with -ast
Among the 7 debian patches available in version 3.11-4 of the package, we noticed the following issues: