Timo Aaltonen pushed to branch debian-unstable at X Strike Force / app / apitrace
Commits: 3075a874 by David Heidelberg at 2022-05-25T14:47:32+02:00 d/patches: switch hightlight.py patch order Signed-off-by: David Heidelberg <[email protected]> - - - - - 2 changed files: - debian/patches/highlight.py-fix1.patch - debian/patches/highlight.py-fix2.patch Changes: ===================================== debian/patches/highlight.py-fix1.patch ===================================== @@ -1,18 +1,38 @@ -commit 2b8019ae2b662ae7686cc2d18c28a83de846bd5f +commit 40a817904a2ca19b21b127b636ae95688635c448 Author: Jose Fonseca <[email protected]> -Date: Mon May 23 20:40:47 2022 +0100 +Date: Mon May 23 20:27:31 2022 +0100 - scripts: Remove reference to spurious script. + scripts: Install highlight.py without executable permission. + + Fixes https://github.com/apitrace/apitrace/pull/795 diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 2f7758bc..7dcb1a80 100644 +index 11384a44..2f7758bc 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt -@@ -1,7 +1,6 @@ +@@ -1,7 +1,22 @@ +-file (GLOB SCRIPTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py) +- + install ( +- PROGRAMS ${SCRIPTS} ++ PROGRAMS ++ convert.py ++ history.py ++ jsondiff.py ++ jsonextractimages.py ++ leaks.py ++ profileshader.py ++ retracediff.py ++ snapdiff.py ++ tracecheck.py ++ tracediff.py ++ unpickle.py ++ DESTINATION ${SCRIPTS_INSTALL_DIR} ++) ++install ( ++ FILES ++ apitrace.PIXExp ++ highlight.py + DESTINATION ${SCRIPTS_INSTALL_DIR} + ) install ( - PROGRAMS - convert.py -- history.py - jsondiff.py - jsonextractimages.py - leaks.py ===================================== debian/patches/highlight.py-fix2.patch ===================================== @@ -1,38 +1,18 @@ -commit 40a817904a2ca19b21b127b636ae95688635c448 +commit 2b8019ae2b662ae7686cc2d18c28a83de846bd5f Author: Jose Fonseca <[email protected]> -Date: Mon May 23 20:27:31 2022 +0100 +Date: Mon May 23 20:40:47 2022 +0100 - scripts: Install highlight.py without executable permission. - - Fixes https://github.com/apitrace/apitrace/pull/795 + scripts: Remove reference to spurious script. diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 11384a44..2f7758bc 100644 +index 2f7758bc..7dcb1a80 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt -@@ -1,7 +1,22 @@ --file (GLOB SCRIPTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py) -- - install ( -- PROGRAMS ${SCRIPTS} -+ PROGRAMS -+ convert.py -+ history.py -+ jsondiff.py -+ jsonextractimages.py -+ leaks.py -+ profileshader.py -+ retracediff.py -+ snapdiff.py -+ tracecheck.py -+ tracediff.py -+ unpickle.py -+ DESTINATION ${SCRIPTS_INSTALL_DIR} -+) -+install ( -+ FILES -+ apitrace.PIXExp -+ highlight.py - DESTINATION ${SCRIPTS_INSTALL_DIR} - ) +@@ -1,7 +1,6 @@ install ( + PROGRAMS + convert.py +- history.py + jsondiff.py + jsonextractimages.py + leaks.py View it on GitLab: https://salsa.debian.org/xorg-team/app/apitrace/-/commit/3075a87420766c5a2de5d9e1f4b555fde8734850 -- View it on GitLab: https://salsa.debian.org/xorg-team/app/apitrace/-/commit/3075a87420766c5a2de5d9e1f4b555fde8734850 You're receiving this email because of your account on salsa.debian.org.
