A question relating to patching a patch

[Ilpo Järvinen]

Hi,

I'd like to flush some changes I'm currently using locally which allow
filtering for awesome menu (e.g., I'm currently having separate
submenus for templates and sys-.* VMs). However, I'm somewhat unsure
how I should do the editing to qubes.lua file. Currently the file
is effectively provided by this patch:

https://github.com/QubesOS/qubes-desktop-linux-awesome/blob/master/awesome-3.5.5-qubes.patch

...While patching a patch is generally tricky to begin with, this
particular case is even more complicated because of the message included
to the patch that I really wouldn't want to try to keep up-to-date up to
the level of "commits included" like it currently does. To me, the easiest
approach would be simply to drop anything from the message besides this:

"Subject: [PATCH] Qubes OS integration

Qubes OS library and changes to default config file."

Is that ok approach? Better suggestions?

If somebody feels that the Signed-off:'s should be preserved too, that
would be easy to arrange and I'd then just add mine to the list to keep
the list from not getting out-dated (and for consistency). Please just
let me know.


--
i.

[Wojtek Porczyk]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Creating a commit which changes a patch file is nothing new and can be done.
That said, you'd probably be better off issuing a commit which would create
a new .patch file, which patches .lua file that would be created by the
previous patch. That way you won't miss the explanation (and purpose) as you
proposed.

Obviously, there is more than one way to do that.

- --
pozdrawiam / best regards _.-._
Wojtek Porczyk .-^' '^-.
Invisible Things Lab |'-.-^-.-'|
| | | |
I do not fear computers, | '-.-' |
I fear lack of them. '-._ : ,-'
-- Isaac Asimov `^-^-_>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJZCZ2EAAoJEL9r2TIQOiNRpXMP/3fv9pUZEhZ0y0CpweSyEf8D
jBCo+PRc3leDoMwpJr9gZoGcPPDxwWJDlvpHHPB708JvJGlP3gYOSxRHHWOfnGfR
Yk4BIMCSFaC1cXAgGKsIvGJ+5fqtMLx9I1hWnaexuUazfYhX+aS9GzTbm9wR8b9F
jZcPAbb5ry5GonDONFkkvzcMn5zyf0gYvNOEySgWQmEe7XJ6VyHtklc0dX+2igPV
pVyipZJYwr2UrV9cl6D++21rkamB3FF3PnlsLQ5CeF1i+OPb8XqYViJqeqbDOxR2
1pNheavoQVj62ZQyi3jklRr9Bwp0FU0Sb21IUXn45KXVzShMQ9UEPvUo5eJm5VKD
9j3z6Q0AkYwT6lbBznJK1GTFLI8WAPgeIGr7ajns+f5lvQOshtftZq2dZBm0DC10
diwWEQlC00xOKcrQFby60BrYUrinbrePRHF3khRXtbJumc/F/qD4vyOOnTwjxEnG
WWRkWX+ZF3FUQ7oUiAS4Vqz6kvuJ0Go5Eys29DzPHVC0OIq09DJhgyP56UvTV8nL
C9iD3f78gacnbC0jCjlBbO41eplVVMPXQLxA999N/JWCFTBt46FmX4lMsExN1LPU
VM8CnYqP7VEblknwnOadUn59EuBWgKluT+UdvYJfEapunZGCWaOqD67xqa18q5WT
FGOcmyZ37/h0AvPHz8ZZ
=LeI1
-----END PGP SIGNATURE-----