[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][xorg-team/app/apitrace][debian-unstable] d/patches: switch hightlight.py patch order



Title: GitLab

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / app / apitrace

Commits:

2 changed files:

Changes:

  • debian/patches/highlight.py-fix1.patch
    1
    -commit 2b8019ae2b662ae7686cc2d18c28a83de846bd5f
    
    1
    +commit 40a817904a2ca19b21b127b636ae95688635c448
    
    2 2
     Author: Jose Fonseca <jfonseca@vmware.com>
    
    3
    -Date:   Mon May 23 20:40:47 2022 +0100
    
    3
    +Date:   Mon May 23 20:27:31 2022 +0100
    
    4 4
     
    
    5
    -    scripts: Remove reference to spurious script.
    
    5
    +    scripts: Install highlight.py without executable permission.
    
    6
    +    
    
    7
    +    Fixes https://github.com/apitrace/apitrace/pull/795
    
    6 8
     
    
    7 9
     diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
    
    8
    -index 2f7758bc..7dcb1a80 100644
    
    10
    +index 11384a44..2f7758bc 100644
    
    9 11
     --- a/scripts/CMakeLists.txt
    
    10 12
     +++ b/scripts/CMakeLists.txt
    
    11
    -@@ -1,7 +1,6 @@
    
    13
    +@@ -1,7 +1,22 @@
    
    14
    +-file (GLOB SCRIPTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
    
    15
    +-
    
    16
    + install (
    
    17
    +-    PROGRAMS ${SCRIPTS}
    
    18
    ++    PROGRAMS
    
    19
    ++        convert.py
    
    20
    ++        history.py
    
    21
    ++        jsondiff.py
    
    22
    ++        jsonextractimages.py
    
    23
    ++        leaks.py
    
    24
    ++        profileshader.py
    
    25
    ++        retracediff.py
    
    26
    ++        snapdiff.py
    
    27
    ++        tracecheck.py
    
    28
    ++        tracediff.py
    
    29
    ++        unpickle.py
    
    30
    ++    DESTINATION ${SCRIPTS_INSTALL_DIR}
    
    31
    ++)
    
    32
    ++install (
    
    33
    ++    FILES
    
    34
    ++        apitrace.PIXExp
    
    35
    ++        highlight.py
    
    36
    +     DESTINATION ${SCRIPTS_INSTALL_DIR}
    
    37
    + )
    
    12 38
      install (
    13
    -     PROGRAMS
    
    14
    -         convert.py
    
    15
    --        history.py
    
    16
    -         jsondiff.py
    
    17
    -         jsonextractimages.py
    
    18
    -         leaks.py

  • debian/patches/highlight.py-fix2.patch
    1
    -commit 40a817904a2ca19b21b127b636ae95688635c448
    
    1
    +commit 2b8019ae2b662ae7686cc2d18c28a83de846bd5f
    
    2 2
     Author: Jose Fonseca <jfonseca@vmware.com>
    
    3
    -Date:   Mon May 23 20:27:31 2022 +0100
    
    3
    +Date:   Mon May 23 20:40:47 2022 +0100
    
    4 4
     
    
    5
    -    scripts: Install highlight.py without executable permission.
    
    6
    -    
    
    7
    -    Fixes https://github.com/apitrace/apitrace/pull/795
    
    5
    +    scripts: Remove reference to spurious script.
    
    8 6
     
    
    9 7
     diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
    
    10
    -index 11384a44..2f7758bc 100644
    
    8
    +index 2f7758bc..7dcb1a80 100644
    
    11 9
     --- a/scripts/CMakeLists.txt
    
    12 10
     +++ b/scripts/CMakeLists.txt
    
    13
    -@@ -1,7 +1,22 @@
    
    14
    --file (GLOB SCRIPTS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.py)
    
    15
    --
    
    16
    - install (
    
    17
    --    PROGRAMS ${SCRIPTS}
    
    18
    -+    PROGRAMS
    
    19
    -+        convert.py
    
    20
    -+        history.py
    
    21
    -+        jsondiff.py
    
    22
    -+        jsonextractimages.py
    
    23
    -+        leaks.py
    
    24
    -+        profileshader.py
    
    25
    -+        retracediff.py
    
    26
    -+        snapdiff.py
    
    27
    -+        tracecheck.py
    
    28
    -+        tracediff.py
    
    29
    -+        unpickle.py
    
    30
    -+    DESTINATION ${SCRIPTS_INSTALL_DIR}
    
    31
    -+)
    
    32
    -+install (
    
    33
    -+    FILES
    
    34
    -+        apitrace.PIXExp
    
    35
    -+        highlight.py
    
    36
    -     DESTINATION ${SCRIPTS_INSTALL_DIR}
    
    37
    - )
    
    11
    +@@ -1,7 +1,6 @@
    
    38 12
      install (
    
    13
    +     PROGRAMS
    
    14
    +         convert.py
    
    15
    +-        history.py
    
    16
    +         jsondiff.py
    
    17
    +         jsonextractimages.py
    
    18
    +         leaks.py


  • Reply to: