Update packaging parts from 0.3.0-1

debian/README.source

@@ -11,7 +11,7 @@ To build a package for local use:
 - Checkout the branch you want to build (assuming `master` here) and make sure
   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.
-- Do a `git merge --no-commit debian/master` (or `debian/buster-backports`, or
+- Do a `git merge --no-commit debian/sid` (or `debian/buster-backports`, or
   `ubuntu/focal`, or...)
 - `debian/extra/prepare-commit-package.sh master` to make the orig.tar.gz file
   and add the `debian/changelog` entry. (Add an additional command line argument

debian/changelog

@@ -1,11 +1,14 @@
-monado (0.1.0+git269.695ac70d-1) UNRELEASED; urgency=medium
+monado (0.3.0-1) unstable; urgency=medium
 
-  * New upstream version 0.1.0+git269.695ac70d
+  * New upstream version 0.3.0 - substantial upstream changes.
-  * Remove all patches: integrated upstream.
-  * Add a patch for system cJSON build.
   * Apply cme fixes.
-  * d/control: Fix Vcs-Browser, Vcs-Git
+  * d/control:
-  * d/control: Add Build-Depends on libx11-xcb-dev
+    - Fix Vcs-Browser, Vcs-Git
+    - Add Build-Depends on libx11-xcb-dev
+    - Revise package description now that conformance tests are released.
+    - Disable optional hidapi dependency on hurd
+    - Add Build-Depends: libdbus-1-dev and a Suggests for Bluetooth Low
+      Energy support
   * d/copyright: Update
   * d/rules:
     - Disable IPC/service module for now.
@@ -13,9 +16,13 @@ monado (0.1.0+git269.695ac70d-1) UNRELEASED; urgency=medium
     - Configure to force system cJSON.
     - Comment out flag only needed before Bullseye.
     - Explicitly disable OpenHMD to avoid confusion/CI issues.
+    - Update for upstream config flags
   * d/README.source: Document procedure for updating and backporting package
+  * docs: Bundle README.source
+  * docs: Ship upstream changelog.
+  * Update xml metadata description.
 
- -- Ryan Pavlik <ryan@ryanpavlik.com>  Tue, 05 May 2020 15:30:13 -0500
+ -- Ryan Pavlik <ryan@ryanpavlik.com>  Fri, 10 Jul 2020 16:53:54 -0500
 
 monado (0.1.0+git108.a8a4d8c3-2) unstable; urgency=medium
 

debian/control

@@ -10,11 +10,12 @@ Build-Depends: debhelper-compat (= 12),
                graphviz,
                libavcodec-dev,
                libcjson-dev,
+               libdbus-1-dev [linux-any],
                libegl1-mesa-dev,
                libeigen3-dev,
                libgl1-mesa-dev,
                libglvnd-dev,
-               libhidapi-dev,
+               libhidapi-dev [!hurd-i386],
                libopencv-dev,
                libsdl2-dev,
                libudev-dev,
@@ -28,10 +29,11 @@ Build-Depends: debhelper-compat (= 12),
                libxcb-randr0-dev,
                libxrandr-dev,
                libxxf86vm-dev,
+               markdown <!nodoc>,
                pkg-config
 Standards-Version: 4.5.0
-Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/debian/master
+Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/debian/sid
-Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b debian/master
+Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b debian/sid
 Homepage: https://monado.freedesktop.org/
 Rules-Requires-Root: no
 
@@ -42,14 +44,14 @@ Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: xr-hardware,
             libopenxr-loader1
+Suggests: bluez [linux-any]
 Provides: libopenxr1
 Description: Monado preview implementation of the OpenXR API
  Monado is an open-source package for interacting with virtual and
  augmented reality (collectively known as XR) hardware and software.
  .
  This package provides a runtime that aims to be a complete and conforming
- implementation of the OpenXR API from Khronos, after further development
+ implementation of the OpenXR API from Khronos, after further development.
- and once the conformance tests are released.
 
 Package: monado-cli
 Architecture: any

debian/copyright

@@ -60,6 +60,10 @@ Files: doc/changes/xrt/*
 Copyright: 2020, Collabora, Ltd. and the Monado contributors
 License: CC0-1.0
 
+Files: src/external/Catch2/*
+Copyright: 2020, Two Blue Cubes Ltd.
+License: BSL-1.0
+
 Files: src/external/cjson/*
 Copyright: 2009-2017, Dave Gamble and cJSON contributors
 License: Expat
@@ -91,8 +95,8 @@ License: Apache-2.0
 
 Files: src/external/flexkalman/flexkalman/AbsolutePositionLeverArmMeasurement.h
   src/external/flexkalman/flexkalman/SO3.h
-Copyright: 2018-2020, Collabora, Ltd.
+Copyright: 2019, 2020, Collabora, Ltd.
-License: Apache-2.0
+License: Apache-2.0 or BSL-1.0
 
 Files: src/external/flexkalman/flexkalman/AbsolutePositionMeasurement.h
   src/external/flexkalman/flexkalman/AugmentedProcessModel.h
@@ -121,7 +125,7 @@ Copyright: 2017, Sean Barrett
 License: Expat
 
 Files: src/external/openxr_includes/*
-Copyright: 2017-2019, The Khronos Group Inc.
+Copyright: 2017-2020, The Khronos Group Inc.
 License: Apache-2.0
 
 Files: src/external/openxr_includes/openxr/loader_interfaces.h
@@ -173,7 +177,7 @@ Copyright: 2018-2020, Collabora, Ltd.
 License: BSL-1.0
 
 Files: src/xrt/drivers/psvr/*
-Copyright: 2019, Collabora, Ltd.
+Copyright: 2019, 2020, Collabora, Ltd.
   2016, Joey Ferwerda.
 License: BSL-1.0
 
@@ -187,7 +191,8 @@ Copyright: 2020, Nova King.
   2019, 2020, Collabora, Ltd.
 License: BSL-1.0
 
-Files: src/xrt/drivers/vive/vive_controller_driver.c
+Files: src/xrt/drivers/vive/vive.h
+  src/xrt/drivers/vive/vive_controller.c
   src/xrt/drivers/vive/vive_device.c
   src/xrt/drivers/vive/vive_protocol.c
   src/xrt/drivers/vive/vive_protocol.h

debian/copyright-scan-patterns.yml

@@ -2,3 +2,5 @@
 ignore:
   pattern:
   - .reuse/*
+  - .gitlab-ci
+

debian/fill.copyright.blanks.yml

@@ -4,7 +4,7 @@ doc/CHANGELOG.md:
 doc/changes/:
   copyright: 2020, Collabora, Ltd. and the Monado contributors
   license: CC0-1.0
-  skip: false
+  skip: true
 doc/changes/README.md:
   copyright: 2020, Collabora, Ltd. and the Proclamation contributors
   license: CC0-1.0
@@ -14,9 +14,19 @@ src/external/imgui/imgui_monado/:
 # Default to BSL.
 src/xrt:
   license: BSL-1.0
+tests/tests_input_transform.cpp:
+  license: BSL-1.0
+tests/tests_main.cpp:
+  license: BSL-1.0
 debian/extra/:
   license: CC0-1.0
 src/xrt/drivers/north_star/distortion/:
   license: BSD-3-Clause
 src/xrt/auxiliary/math/m_quatexpmap.cpp:
   license: Apache-2.0
+scripts/:
+  license: BSL-1.0
+src/external/flexkalman/flexkalman/AbsolutePositionLeverArmMeasurement.h:
+  license: Apache-2.0 or BSL-1.0
+src/external/flexkalman/flexkalman/SO3.h:
+  license: Apache-2.0 or BSL-1.0

debian/fix.scanned.copyright

@@ -1,2 +1,2 @@
 # Remove mistaken prefix.
-! copyright Files:~/.*/ Copyright=~"s/Text: //"
+! Files:~/.*/ Copyright=~"s/Text: //"

debian/gbp.conf

@@ -1,4 +1,4 @@
 [DEFAULT]
-debian-branch = debian/master
+debian-branch = debian/sid
 pristine-tar = True
 upstream-branch = master

debian/libopenxr1-monado.docs

@@ -1,2 +1,4 @@
 debian/README.Debian
 debian/README.source
+usr/share/doc/monado/changelog
+usr/share/doc/monado/changelog.html

debian/org.freedesktop.monado.openxr1.metainfo.xml

@@ -11,8 +11,7 @@
         </p>
         <p>
             This package provides a runtime that aims to be a complete and conforming
-            implementation of the OpenXR API from Khronos, after further development
+            implementation of the OpenXR API from Khronos, after further development.
-            and once the conformance tests are released.
         </p>
     </description>
     <provides>

debian/rules

@@ -18,7 +18,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=+all
 
 # We manage active runtime via update-alternatives
 # We use a relative runtime path to allow Multi-Arch: same to work.
-# We disable the service process for now because of packaging (need to split a new binary package) and missing auto-start.
+# We disable the service process for now because of packaging (need to split a new binary package)
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	  -DXRT_HAVE_SYSTEM_CJSON=ON \
@@ -29,6 +29,15 @@ override_dh_auto_configure:
 	  -DXRT_FEATURE_SERVICE=OFF \
 	  -DXRT_BUILD_DRIVER_OHMD=OFF
 
+# Make the changelog usable here
+override_dh_install:
+ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
+	mkdir -p debian/tmp/usr/share/doc/monado
+	cp doc/CHANGELOG.md debian/tmp/usr/share/doc/monado/changelog
+	markdown doc/CHANGELOG.md > debian/tmp/usr/share/doc/monado/changelog.html
+endif
+	dh_install
+
 # Remove imgui config file if it's there.
 override_dh_auto_clean:
 	-rm -f imgui.ini