Timo Aaltonen pushed to branch debian-unstable at X Strike Force / vulkan / 
spirv-headers


Commits:
0412459a by Timo Aaltonen at 2022-04-07T14:56:45+03:00
use-arch-independent.diff: Create arch-independent cmake files. Thanks, Andrea 
Pappacoda!

- - - - -
0cae9101 by Timo Aaltonen at 2022-04-07T14:57:40+03:00
Install cmake files again.

- - - - -
009d3b2b by Timo Aaltonen at 2022-04-07T22:00:43+03:00
source: Bump format to 3.0 (quilt).

- - - - -
55b8de6c by Timo Aaltonen at 2022-04-07T22:01:16+03:00
release to sid

- - - - -


6 changed files:

- debian/changelog
- debian/patches/series
- + debian/patches/use-arch-independent.diff
- debian/rules
- debian/source/format
- debian/spirv-headers.install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+spirv-headers (1.6.1+1.3.204.0-4) unstable; urgency=medium
+
+  * use-arch-independent.diff: Create arch-independent cmake files.
+    Thanks, Andrea Pappacoda!
+  * Install cmake files again.
+  * source: Bump format to 3.0 (quilt).
+
+ -- Timo Aaltonen <[email protected]>  Thu, 07 Apr 2022 22:01:04 +0300
+
 spirv-headers (1.6.1+1.3.204.0-3) unstable; urgency=medium
 
   * Drop cmake files, they are not arch-independent, and apparently


=====================================
debian/patches/series
=====================================
@@ -1 +1 @@
-#placeholder
+use-arch-independent.diff


=====================================
debian/patches/use-arch-independent.diff
=====================================
@@ -0,0 +1,17 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,9 +89,14 @@ if (SPIRV_HEADERS_ENABLE_INSTALL)
+     set(namespace "${PROJECT_NAME}::")
+ 
+     include(CMakePackageConfigHelpers)
++
++    if (NOT CMAKE_VERSION VERSION_LESS 3.14)
++        set(arch_independent_str ARCH_INDEPENDENT)
++    endif()
+     write_basic_package_version_file(
+         "${version_config}"
+         COMPATIBILITY SameMajorVersion
++        ${arch_independent_str}
+     )
+ 
+     configure_package_config_file(


=====================================
debian/rules
=====================================
@@ -9,12 +9,6 @@ include /usr/share/dpkg/pkg-info.mk
 override_dh_auto_install:
        dh_auto_install --destdir=debian/tmp
 
-override_dh_install:
-       # these are not arch-independent
-       rm -rf debian/tmp/usr/share/cmake
-
-       dh_install
-
 gentarball:
        git archive --format=tar upstream-unstable 
--prefix=$(DEB_SOURCE)-$(DEB_VERSION_UPSTREAM)/ | \
                gzip -9 > \


=====================================
debian/source/format
=====================================
@@ -1 +1 @@
-1.0
+3.0 (quilt)


=====================================
debian/spirv-headers.install
=====================================
@@ -1,2 +1,3 @@
 usr/include
+usr/share/cmake
 usr/share/pkgconfig



View it on GitLab: 
https://salsa.debian.org/xorg-team/vulkan/spirv-headers/-/compare/10d7f1f6091de213b482cd80366a98ea1f22dfeb...55b8de6c1216cd7137edc923daa46b034ba09a2c

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/vulkan/spirv-headers/-/compare/10d7f1f6091de213b482cd80366a98ea1f22dfeb...55b8de6c1216cd7137edc923daa46b034ba09a2c
You're receiving this email because of your account on salsa.debian.org.


Reply via email to