Bug#1067474: gxr-openvr: package Build-Depends on libgxr-0.15-0 whic is no longer built

2024-04-26 Thread Andreas Beckmann
Followup-For: Bug #1067474
Control: tag -1 pending

Hi,

I've just uploaded a NMU (diff attached) to DELAYED/2 fixing this issue,
a followup issue (from Ubuntu) and cleaning up some cruft.
Please let me know if I should delay it longer.

Andreas

PS: the Vcs-* variables point to the repository of a different package.
You probably need to append '-b debian/master-openvr' (if that is the
correct branch) to Vcs-Git.
diff -Nru gxr-openvr-0.15.1/debian/changelog gxr-openvr-0.15.1/debian/changelog
--- gxr-openvr-0.15.1/debian/changelog  2020-08-08 07:22:29.0 +0200
+++ gxr-openvr-0.15.1/debian/changelog  2024-04-26 20:00:15.0 +0200
@@ -1,3 +1,19 @@
+gxr-openvr (0.15.1-2.1) unstable; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Non-maintainer upload.
+  * Fix building twice in a row.
+  * Switch B-D from pkg-config to pkgconf.
+
+  [ Michael Hudson-Doyle ]
+  * s/libgxr-0.15-0/libgxr-dev/ in Build-Depends.  (Closes: #1067474)
+
+  [ Julian Andres Klode ]
+  * Remove libgxr-0.15-0, libsdl-2.0-0 depends. They are taken care of by
+shlibs and break time_t.
+
+ -- Andreas Beckmann   Fri, 26 Apr 2024 20:00:15 +0200
+
 gxr-openvr (0.15.1-2) unstable; urgency=medium
 
   * Source only upload.
diff -Nru gxr-openvr-0.15.1/debian/clean gxr-openvr-0.15.1/debian/clean
--- gxr-openvr-0.15.1/debian/clean  1970-01-01 01:00:00.0 +0100
+++ gxr-openvr-0.15.1/debian/clean  2024-04-26 19:36:45.0 +0200
@@ -0,0 +1,2 @@
+build/
+examples/cube/shaders/*.spv
diff -Nru gxr-openvr-0.15.1/debian/control gxr-openvr-0.15.1/debian/control
--- gxr-openvr-0.15.1/debian/control2020-08-08 07:22:12.0 +0200
+++ gxr-openvr-0.15.1/debian/control2024-04-26 19:58:51.0 +0200
@@ -11,25 +11,22 @@
  gtk-doc-tools,
  libgtk-3-dev (>= 3.22),
  libgulkan-dev (>= 0.15.0),
- libgxr-0.15-0,
+ libgxr-dev,
  libjson-glib-dev,
  libopenvr-dev,
  mesa-common-dev,
  meson (>= 0.45.1),
- pkg-config,
+ pkgconf,
 Standards-Version: 4.5.0
 Homepage: https://gitlab.freedesktop.org/xrdesktop/gxr
 Vcs-Browser: https://salsa.debian.org/xrdesktop-team/gxr
 Vcs-Git: https://salsa.debian.org/xrdesktop-team/gxr.git
 
 Package: libgxr-openvr-0.15-0
-Section: contrib/libs
 Architecture: linux-any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
- libgxr-0.15-0,
- libsdl2-2.0-0,
 Breaks: libgxr-0.14-0 (<< 0.15)
 Replaces: libgxr-0.14-0 (<< 0.15)
 Description: gxr backend for nonfree OpenVR libraries
diff -Nru gxr-openvr-0.15.1/debian/rules gxr-openvr-0.15.1/debian/rules
--- gxr-openvr-0.15.1/debian/rules  2020-08-08 07:22:12.0 +0200
+++ gxr-openvr-0.15.1/debian/rules  2024-04-26 19:55:16.0 +0200
@@ -25,4 +25,3 @@
env $(test_env) meson build
env $(test_env) ninja -C build
env $(test_env) meson test -C build/ --no-suite gxr:xr --no-suite 
post-install
-


Bug#1067474: gxr-openvr: package Build-Depends on libgxr-0.15-0 whic is no longer built

2024-03-21 Thread Michael Hudson-Doyle
Package: gxr-openvr
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
X-Debbugs-Cc: michael.hud...@ubuntu.com

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * s/libgxr-0.15-0/libgxr-dev/ in Build-Depends.

Thanks for considering the patch.


-- System Information:
Debian Release: trixie/sid
  APT prefers mantic-updates
  APT policy: (500, 'mantic-updates'), (500, 'mantic-security'), (500, 
'mantic'), (100, 'mantic-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.5.0-25-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_NZ.UTF-8:en
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru gxr-openvr-0.15.1/debian/control gxr-openvr-0.15.1/debian/control
--- gxr-openvr-0.15.1/debian/control2024-03-08 18:00:00.0 +1300
+++ gxr-openvr-0.15.1/debian/control2024-03-22 18:20:57.0 +1300
@@ -1,8 +1,7 @@
 Source: gxr-openvr
 Section: contrib/libs
 Priority: optional
-Maintainer: Ubuntu Developers 
-XSBC-Original-Maintainer: Andrew Lee (李健秋) 
+Maintainer: Andrew Lee (李健秋) 
 Uploaders: Héctor Orón Martínez 
 Build-Depends:
  debhelper (>= 11),
@@ -12,7 +11,7 @@
  gtk-doc-tools,
  libgtk-3-dev (>= 3.22),
  libgulkan-dev (>= 0.15.0),
- libgxr-0.15-0,
+ libgxr-dev,
  libjson-glib-dev,
  libopenvr-dev,
  mesa-common-dev,