debian: Update some packaging files

This commit is contained in:
Rylie Pavlik 2024-05-03 12:18:06 -05:00
parent 5f5039d76b
commit 27f4d9c506
6 changed files with 133 additions and 91 deletions

View file

@ -1,19 +1,19 @@
This package is based on the version of Monado in Debian This package is based on the version of Monado in Debian
(https://salsa.debian.org/monado-team/monado), but is slightly adapted for use (https://salsa.debian.org/xr-team/monado), but is slightly adapted for use
directly within the "upstream" source tree. directly within the "upstream" source tree.
There is useful stuff, more directed at package maintenance for distro There is useful stuff, more directed at package maintenance for distro
submission, in the Debian copy of this file: submission, in the Debian copy of this file:
<https://salsa.debian.org/monado-team/monado/-/blob/debian/sid/debian/README.source> <https://salsa.debian.org/xr-team/monado/-/blob/debian/sid/debian/README.source>
To build a package for local use: To build a package for local use:
- Checkout the branch you want to build (assuming `master` here) and make sure - Checkout the branch you want to build (assuming `main` here) and make sure
your tree is clean (`git reset --hard` will be used later!) A fresh clone or your tree is clean (`git reset --hard` will be used later!) A fresh clone or
one kept clean just for package building is probably a good idea. one kept clean just for package building is probably a good idea.
- Do a `git merge --no-commit debian/sid` (or `debian/buster-backports`, or - Do a `git merge --no-commit debian/sid` (or `debian/buster-backports`, or
`ubuntu/focal`, or...) `ubuntu/focal`, or...)
- `debian/extra/prepare-commit-package.sh master` to make the orig.tar.gz file - `debian/extra/prepare-commit-package.sh main` to make the orig.tar.gz file
and add the `debian/changelog` entry. (Add an additional command line argument and add the `debian/changelog` entry. (Add an additional command line argument
with the debian revision if you want to customize it. The default is usually with the debian revision if you want to customize it. The default is usually
good.) good.)

1
debian/clean vendored
View file

@ -1 +1,2 @@
src/xrt/ipc/shared/ipcproto/__pycache__/ src/xrt/ipc/shared/ipcproto/__pycache__/
imgui.ini

154
debian/copyright vendored
View file

@ -7,16 +7,20 @@ Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: .cmake-format.py Files: .cmake-format.py
Copyright: 2021-2022, Collabora, Ltd. Copyright: 2021, 2022, Collabora, Ltd.
License: BSL-1.0 License: CC0-1.0
Files: CMakePresets.json Files: CMakePresets.json
vcpkg.json vcpkg.json
Copyright: 2018-2021, Collabora, Ltd. Copyright: 2018-2021, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: CompilerFlags.cmake
Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0
Files: cmake/* Files: cmake/*
Copyright: 2018-2023, Collabora, Ltd. Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: cmake/.cmake-format.json Files: cmake/.cmake-format.json
@ -35,7 +39,7 @@ Files: cmake/FindEGL.cmake
Copyright: 2019, 2021, Rylie Pavlik <rylie.pavlik@collabora.com> Copyright: 2019, 2021, Rylie Pavlik <rylie.pavlik@collabora.com>
2014, Martin Gräßlin <mgraesslin@kde.org> 2014, Martin Gräßlin <mgraesslin@kde.org>
2014, Alex Merry <alex.merry@kde.org> 2014, Alex Merry <alex.merry@kde.org>
License: BSL-1.0 License: BSD-3-clause
Files: cmake/FindEigen3.cmake Files: cmake/FindEigen3.cmake
Copyright: 2009, Benoit Jacob <jacob.benoit.1@gmail.com> Copyright: 2009, Benoit Jacob <jacob.benoit.1@gmail.com>
@ -113,7 +117,7 @@ Copyright: 2018-2023, Collabora, Ltd. and the Monado contributors
License: BSL-1.0 License: BSL-1.0
Files: doc/CHANGELOG.md Files: doc/CHANGELOG.md
Copyright: 2020, Collabora, Ltd. and the Monado contributors Copyright: 2020-2022, Collabora, Ltd. and the Monado contributors
License: CC0-1.0 License: CC0-1.0
Files: doc/changes/* Files: doc/changes/*
@ -152,12 +156,21 @@ Files: doc/changes/xrt/*
Copyright: 2020, Collabora, Ltd. and the Monado contributors Copyright: 2020, Collabora, Ltd. and the Monado contributors
License: CC0-1.0 License: CC0-1.0
Files: doc/doxygen-awesome-css/*
Copyright: 2021-2023, jothepro
License: Expat
Files: doc/doxygen-awesome-css/doxygen-awesome-darkmode-toggle.js
doc/doxygen-awesome-css/doxygen-awesome-paragraph-link.js
Copyright: 2021-2023, jothepro
License: Apache-2.0 and/or Expat
Files: doc/example_configs/* Files: doc/example_configs/*
Copyright: 2018-2020, Collabora, Ltd. and the Monado contributors Copyright: 2018-2020, Collabora, Ltd. and the Monado contributors
License: BSL-1.0 License: BSL-1.0
Files: doc/hand-tracking-mercury.md Files: doc/hand-tracking-mercury.md
Copyright: 2018-2022, Collabora, Ltd. Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: gradlew Files: gradlew
@ -165,13 +178,26 @@ Copyright: 2015-2021, the original authors.
License: Apache-2.0 License: Apache-2.0
Files: scripts/* Files: scripts/*
Copyright: 2018-2023, Collabora, Ltd. Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0
Files: src/*
Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/external/Catch2/* Files: src/external/Catch2/*
Copyright: 2022, Two Blue Cubes Ltd. Copyright: 2022, Two Blue Cubes Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/external/android-jni-wrap/wrap/android.hardware.display.cpp
src/external/android-jni-wrap/wrap/android.hardware.display.h
src/external/android-jni-wrap/wrap/android.hardware.display.impl.h
src/external/android-jni-wrap/wrap/java.io.cpp
src/external/android-jni-wrap/wrap/java.io.h
src/external/android-jni-wrap/wrap/java.io.impl.h
Copyright: 2021-2024, Qualcomm Innovation Center, Inc.
License: BSL-1.0
Files: src/external/cjson/* Files: src/external/cjson/*
Copyright: 2009-2017, Dave Gamble and cJSON contributors Copyright: 2009-2017, Dave Gamble and cJSON contributors
License: Expat License: Expat
@ -183,7 +209,7 @@ License: Apache-2.0
Files: src/external/flexkalman/flexkalman/AbsolutePositionLeverArmMeasurement.h Files: src/external/flexkalman/flexkalman/AbsolutePositionLeverArmMeasurement.h
src/external/flexkalman/flexkalman/SO3.h src/external/flexkalman/flexkalman/SO3.h
Copyright: 2019, 2020, Collabora, Ltd. Copyright: 2018-2024, Collabora, Ltd.
License: Apache-2.0 or BSL-1.0 License: Apache-2.0 or BSL-1.0
Files: src/external/flexkalman/flexkalman/AbsolutePositionMeasurement.h Files: src/external/flexkalman/flexkalman/AbsolutePositionMeasurement.h
@ -206,8 +232,8 @@ Copyright: 2013-2022, David Herberth
License: Expat License: Expat
Files: src/external/glad/include/* Files: src/external/glad/include/*
Copyright: 2007-2022, The Khronos Group Inc. Copyright: 2007-2024, The Khronos Group Inc.
License: Khronos License: Apache-2.0
Files: src/external/glad/include/KHR/* Files: src/external/glad/include/KHR/*
Copyright: 2008-2018, The Khronos Group Inc. Copyright: 2008-2018, The Khronos Group Inc.
@ -247,7 +273,7 @@ Files: src/external/hungarian/*
Copyright: 2016, mcximing Copyright: 2016, mcximing
License: BSD-2-clause License: BSD-2-clause
Files: src/external/imgui/* Files: src/external/imgui/imgui/*
Copyright: 2015, Stephan Dilly Copyright: 2015, Stephan Dilly
2014-2020, Omar Cornut 2014-2020, Omar Cornut
License: Expat License: Expat
@ -312,19 +338,23 @@ Files: src/external/openvr_includes/CHANGELOG.md
Copyright: 2018-2020, Collabora, Ltd. Copyright: 2018-2020, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/external/openvr_includes/openvr.h
Copyright: 2015, Valve Corporation
License: BSD-3-clause
Files: src/external/openvr_includes/openvr_driver.h Files: src/external/openvr_includes/openvr_driver.h
Copyright: 2015-2020, Valve Corporation Copyright: 2015-2020, Valve Corporation
License: BSD-3-clause License: BSD-3-clause
Files: src/external/openxr_includes/* Files: src/external/openxr_includes/*
Copyright: 2007-2022, The Khronos Group Inc. Copyright: 2007-2024, The Khronos Group Inc.
License: Apache-2.0 or Expat License: Apache-2.0 or Expat
Files: src/external/openxr_includes/openxr/loader_interfaces.h Files: src/external/openxr_includes/openxr/XR_MNDX_ball_on_a_stick_controller.h
Copyright: 2017-2022, The Khronos Group Inc. src/external/openxr_includes/openxr/XR_MNDX_hydra.h
2017, Valve Corporation src/external/openxr_includes/openxr/XR_MNDX_system_buttons.h
2017, LunarG, Inc. Copyright: 2018-2024, Collabora, Ltd.
License: Apache-2.0 License: BSL-1.0
Files: src/external/renderdoc_api/* Files: src/external/renderdoc_api/*
Copyright: 2019-2022, Baldur Karlsson Copyright: 2019-2022, Baldur Karlsson
@ -335,12 +365,12 @@ Copyright: 2017, Sean Barrett
License: Expat or Unlicense License: Expat or Unlicense
Files: src/external/tinyceres/* Files: src/external/tinyceres/*
Copyright: 2015, 2019, 2021, 2022, Google Inc. Copyright: 2021, 2022, Collabora, Ltd.
2018-2022, Collabora, Ltd. 2015, 2019, 2021, 2022, Google Inc.
License: BSD-3-clause License: BSD-3-clause
Files: src/external/tinyceres/README.md Files: src/external/tinyceres/README.md
Copyright: 2022, Collabora, Ltd. Copyright: 2021, 2022, Collabora, Ltd.
License: CC0-1.0 License: CC0-1.0
Files: src/external/tinyceres/include/* Files: src/external/tinyceres/include/*
@ -377,6 +407,10 @@ Copyright: 2012-2021, Free Software Foundation, Inc.
License: BSD-3-clause License: BSD-3-clause
Files: src/external/util-headers/* Files: src/external/util-headers/*
Copyright: 2009, 2010, Iowa State University.
License: BSL-1.0
Files: src/external/util-headers/util/Finally.h
Copyright: 2016, Sensics, Inc. Copyright: 2016, Sensics, Inc.
License: BSL-1.0 License: BSL-1.0
@ -385,21 +419,17 @@ Copyright: 2022, Collabora, Ltd.
2015, Sensics, Inc. 2015, Sensics, Inc.
License: BSL-1.0 License: BSL-1.0
Files: src/external/util-headers/util/Stride.h Files: src/external/valve-file-vdf/*
Copyright: 2009, 2010, Iowa State University. Copyright: 2016 Matthias Moeller
License: BSL-1.0 License: Expat
Files: src/xrt/*
Copyright: 2018-2023, Collabora, Ltd.
License: BSL-1.0
Files: src/xrt/auxiliary/android/android_looper.cpp Files: src/xrt/auxiliary/android/android_looper.cpp
src/xrt/auxiliary/android/android_looper.h src/xrt/auxiliary/android/android_looper.h
Copyright: 2021, Qualcomm Innovation Center, Inc. Copyright: 2021-2024, Qualcomm Innovation Center, Inc.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/auxiliary/android/src/main/java/org/freedesktop/monado/auxiliary/SystemUiController.kt Files: src/xrt/auxiliary/android/src/main/java/org/freedesktop/monado/auxiliary/SystemUiController.kt
Copyright: 2021, Qualcomm Innovation Center, Inc. Copyright: 2021-2024, Qualcomm Innovation Center, Inc.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/auxiliary/bindings/bindings.json Files: src/xrt/auxiliary/bindings/bindings.json
@ -412,7 +442,7 @@ License: BSL-1.0
Files: src/xrt/auxiliary/math/m_filter_one_euro.c Files: src/xrt/auxiliary/math/m_filter_one_euro.c
Copyright: 2021, 2022, Jan Schmidt Copyright: 2021, 2022, Jan Schmidt
2019-2021, Collabora, Ltd. 2019-2023, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/auxiliary/math/m_filter_one_euro.h Files: src/xrt/auxiliary/math/m_filter_one_euro.h
@ -448,17 +478,16 @@ Copyright: 2020, 2021, Moses Turner.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/compositor/main/comp_window_peek.c Files: src/xrt/compositor/main/comp_window_peek.c
src/xrt/compositor/main/comp_window_peek.h Copyright: 2022, Simon Zeni <simon@bl4ckb0ne.ca>
Copyright: 2020, 2022, Simon Zeni <simon@bl4ckb0ne.ca> 2022, 2023, Collabora, Ltd.
License: BSL-1.0
Files: src/xrt/compositor/main/comp_window_peek.h
Copyright: 2022, Simon Zeni <simon@bl4ckb0ne.ca>
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/compositor/shaders/* Files: src/xrt/compositor/shaders/*
Copyright: 2020-2022, Collabora Ltd. Copyright: 2021-2023, Collabora Ltd.
License: BSL-1.0
Files: src/xrt/compositor/shaders/cube.frag
src/xrt/compositor/shaders/cube.vert
Copyright: 2020, 2022, Simon Zeni <simon@bl4ckb0ne.ca>
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/compositor/shaders/mesh.frag Files: src/xrt/compositor/shaders/mesh.frag
@ -468,29 +497,25 @@ Copyright: 2019, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/compositor/shaders/mesh.vert Files: src/xrt/compositor/shaders/mesh.vert
Copyright: 2018-2023, Collabora, Ltd. Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/android/android_sensors.c Files: src/xrt/drivers/android/android_sensors.c
Copyright: 2020, Collabora, Ltd. Copyright: 2020-2023, Collabora, Ltd.
2015, Joey Ferwerda. 2015, Joey Ferwerda.
2013, Jakob Bornecrantz. 2013, Jakob Bornecrantz.
2013, Fredrik Hultin. 2013, Fredrik Hultin.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/hdk/hdk_device.cpp Files: src/xrt/drivers/hdk/hdk_device.cpp
Copyright: 2019, Collabora, Ltd. Copyright: 2019-2023, Collabora, Ltd.
2014-2018, Sensics, Inc. 2014-2018, Sensics, Inc.
2014, Kevin M. Godby 2014, Kevin M. Godby
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/hydra/* Files: src/xrt/drivers/hydra/hydra_driver.c
Copyright: 2019, Collabora, Ltd. Copyright: 2019-2021, Collabora, Ltd.
2011, Iowa State University 2009-2011, Iowa State University
License: BSL-1.0
Files: src/xrt/drivers/hydra/hydra_interface.h
Copyright: 2018-2023, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/illixr/* Files: src/xrt/drivers/illixr/*
@ -517,9 +542,9 @@ Copyright: 2021, CombineReality
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/north_star/ns_hmd.c Files: src/xrt/drivers/north_star/ns_hmd.c
Copyright: 2020, Nova King. Copyright: 2020-2023, Collabora, Ltd.
2020, Nova King.
2020, Moses Turner. 2020, Moses Turner.
2020, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/north_star/ns_hmd.h Files: src/xrt/drivers/north_star/ns_hmd.h
@ -528,6 +553,11 @@ Copyright: 2021, Moses Turner.
2019, Collabora, Ltd. 2019, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/pssense/*
Copyright: 2023, Jarett Millard
2023, Collabora, Ltd.
License: BSL-1.0
Files: src/xrt/drivers/psvr/* Files: src/xrt/drivers/psvr/*
Copyright: 2019-2022, Collabora, Ltd. Copyright: 2019-2022, Collabora, Ltd.
2016, Joey Ferwerda. 2016, Joey Ferwerda.
@ -535,20 +565,25 @@ License: BSL-1.0
Files: src/xrt/drivers/psvr/psvr_interface.h Files: src/xrt/drivers/psvr/psvr_interface.h
src/xrt/drivers/psvr/psvr_prober.c src/xrt/drivers/psvr/psvr_prober.c
Copyright: 2018-2023, Collabora, Ltd. Copyright: 2018-2024, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/qwerty/* Files: src/xrt/drivers/qwerty/*
Copyright: 2021, Mateo de Mayo. Copyright: 2021, Mateo de Mayo.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/qwerty/qwerty_interface.h
Copyright: 2023, Collabora, Ltd.
2021, Mateo de Mayo.
License: BSL-1.0
Files: src/xrt/drivers/realsense/rs_ddev.c Files: src/xrt/drivers/realsense/rs_ddev.c
Copyright: 2020, Nova King. Copyright: 2020-2023, Collabora, Ltd.
2019-2021, Collabora, Ltd. 2020, Nova King.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/rift_s/* Files: src/xrt/drivers/rift_s/*
Copyright: 2020-2022, Jan Schmidt Copyright: 2020-2023, Jan Schmidt
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/rift_s/rift_s.c Files: src/xrt/drivers/rift_s/rift_s.c
@ -567,7 +602,7 @@ License: BSL-1.0
Files: src/xrt/drivers/rift_s/rift_s_camera.c Files: src/xrt/drivers/rift_s/rift_s_camera.c
src/xrt/drivers/rift_s/rift_s_interface.h src/xrt/drivers/rift_s/rift_s_interface.h
Copyright: 2021, 2022, Jan Schmidt Copyright: 2021, 2022, Jan Schmidt
2019-2021, Collabora, Ltd. 2019-2023, Collabora, Ltd.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/rift_s/rift_s_protocol.c Files: src/xrt/drivers/rift_s/rift_s_protocol.c
@ -583,9 +618,12 @@ Copyright: 2019, Lucas Teske <lucas@teske.com.br>
2019, 2020, Jan Schmidt 2019, 2020, Jan Schmidt
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/simula/* Files: src/xrt/drivers/rift_s/rift_s_tracker.c
Copyright: 2020, 2021, Moses Turner. Copyright: 2023, Collabora, Ltd.
2020, 2021, Collabora, Ltd. 2019-2022, Jan Schmidt
2016, Philipp Zabel
2013, Jakob Bornecrantz.
2013, Fredrik Hultin.
License: BSL-1.0 License: BSL-1.0
Files: src/xrt/drivers/simula/svr_interface.h Files: src/xrt/drivers/simula/svr_interface.h

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# Copyright 2020-2024, Rylie Pavlik <rylie@ryliepavlik.com> # SPDX-FileCopyrightText: 2020-2024, Rylie Pavlik <rylie@ryliepavlik.com>
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
# Packages produced this way are for automated use only and shouldn't be uploaded to the Debian archive. # Packages produced this way are for automated use only and shouldn't be uploaded to the Debian archive.

3
debian/gbp.conf vendored
View file

@ -1,4 +1,7 @@
[DEFAULT] [DEFAULT]
debian-branch = debian/bullseye debian-branch = debian/bullseye
debian-tag = debian/%(version)s
debian-tag-msg = %(pkg)s Debian release %(version)s
pristine-tar = True pristine-tar = True
upstream-branch = main upstream-branch = main
upstream-tag = v%(version)s

View file

@ -1,7 +1,7 @@
--- ---
Bug-Database: https://gitlab.freedesktop.org/monado/monado/-/issues Bug-Database: https://gitlab.freedesktop.org/monado/monado/-/issues
Bug-Submit: https://gitlab.freedesktop.org/monado/monado/-/issues Bug-Submit: https://gitlab.freedesktop.org/monado/monado/-/issues
Changelog: https://gitlab.freedesktop.org/monado/monado/-/blob/master/doc/CHANGELOG.md Changelog: https://gitlab.freedesktop.org/monado/monado/-/blob/main/doc/CHANGELOG.md
Documentation: https://monado.pages.freedesktop.org/monado/ Documentation: https://monado.pages.freedesktop.org/monado/
Repository-Browse: hhttps://gitlab.freedesktop.org/monado/monado/ Repository-Browse: hhttps://gitlab.freedesktop.org/monado/monado/
Repository: https://gitlab.freedesktop.org/monado/monado.git Repository: https://gitlab.freedesktop.org/monado/monado.git