Bug#1059755: grep: move files to /usr for DEP17

2024-01-04 Thread Santiago Ruano Rincón
Control: fixed -1 grep/3.11-4~exp1


signature.asc
Description: PGP signature


Bug#1059755: grep: move files to /usr for DEP17

2024-01-04 Thread Santiago Ruano Rincón
Control: tags -1 + fixed-in-experimental

Hi Helmut!

El 31/12/23 a las 13:55, Helmut Grohne escribió:
> Package: grep
> Version: 3.11-3
> Tags: patch
> User: helm...@debian.org
> Usertags: dep17m2
> 
> Hi,
> 
> in order to finalize the /usr-merge via DEP17, we are about to move
> files to /usr. grep is relevant now, because it is part of the essential
> set used by debootstrap. Hence, I'm sending a patch. This patch must not
> be backported to bookworm-backports or older. If you want to keep grep
> easily backportable, please use dh_movetousr instead.
> 
> Helmut

> diff --minimal -Nru grep-3.11/debian/changelog grep-3.11/debian/changelog
> --- grep-3.11/debian/changelog2023-08-22 19:49:07.0 +0200
> +++ grep-3.11/debian/changelog2023-12-31 13:49:35.0 +0100
> @@ -1,3 +1,10 @@
> +grep (3.11-3.1) UNRELEASED; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * Move files to /usr. (Closes: #-1)
> +
> + -- Helmut Grohne   Sun, 31 Dec 2023 13:49:35 +0100
> +
>  grep (3.11-3) unstable; urgency=medium
>  
>* Add patch to remove generated files in clean target. Patch by Bas
> diff --minimal -Nru grep-3.11/debian/rules grep-3.11/debian/rules
> --- grep-3.11/debian/rules2023-08-22 19:43:09.0 +0200
> +++ grep-3.11/debian/rules2023-12-31 13:49:34.0 +0100
> @@ -38,10 +38,6 @@
>  endif
>  DEB_CONFIGURE_SCRIPT_ENV += LIBS="$(LIBS)"
>  
> -# FIXME: CDBS should include a specific var for this
> -# (e.g. DEB_CONFIGURE_EXECDIR in autotools-vars.mk)?
> -DEB_CONFIGURE_EXTRA_FLAGS += --exec-prefix=/
> -
>  # Run expensive tests only on amd64 and i386. Builders have had some
>  # problems with expensive checks, e.g. long-pattern-perf, on other
>  # architectures such as s390x, ppc64el and hurd-i386.

This has been addressed in 3.11-4~exp1, that is now waiting in
experimental. If you are OK, I can upload it to unstable.

Cheers,

 -- Santiago


signature.asc
Description: PGP signature


Bug#1059755: grep: move files to /usr for DEP17

2023-12-31 Thread Helmut Grohne
Package: grep
Version: 3.11-3
Tags: patch
User: helm...@debian.org
Usertags: dep17m2

Hi,

in order to finalize the /usr-merge via DEP17, we are about to move
files to /usr. grep is relevant now, because it is part of the essential
set used by debootstrap. Hence, I'm sending a patch. This patch must not
be backported to bookworm-backports or older. If you want to keep grep
easily backportable, please use dh_movetousr instead.

Helmut
diff --minimal -Nru grep-3.11/debian/changelog grep-3.11/debian/changelog
--- grep-3.11/debian/changelog  2023-08-22 19:49:07.0 +0200
+++ grep-3.11/debian/changelog  2023-12-31 13:49:35.0 +0100
@@ -1,3 +1,10 @@
+grep (3.11-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move files to /usr. (Closes: #-1)
+
+ -- Helmut Grohne   Sun, 31 Dec 2023 13:49:35 +0100
+
 grep (3.11-3) unstable; urgency=medium
 
   * Add patch to remove generated files in clean target. Patch by Bas
diff --minimal -Nru grep-3.11/debian/rules grep-3.11/debian/rules
--- grep-3.11/debian/rules  2023-08-22 19:43:09.0 +0200
+++ grep-3.11/debian/rules  2023-12-31 13:49:34.0 +0100
@@ -38,10 +38,6 @@
 endif
 DEB_CONFIGURE_SCRIPT_ENV += LIBS="$(LIBS)"
 
-# FIXME: CDBS should include a specific var for this
-# (e.g. DEB_CONFIGURE_EXECDIR in autotools-vars.mk)?
-DEB_CONFIGURE_EXTRA_FLAGS += --exec-prefix=/
-
 # Run expensive tests only on amd64 and i386. Builders have had some
 # problems with expensive checks, e.g. long-pattern-perf, on other
 # architectures such as s390x, ppc64el and hurd-i386.