----- Original Message -----
> From: "Adam D. Barratt" <a...@adam-barratt.org.uk>
> To: "Timothy Pearson" <tpear...@raptorengineering.com>, "1061652"
> <1061...@bugs.debian.org>
> Sent: Monday, January 29, 2024 11:21:44 AM
> Subject: Re: Bug#1061652: bookworm-pu: package rss-glx/0.9.1-6.4+deb12u1
> On Sun, 2024-01-28 at 16:38 -0600, Timothy Pearson wrote:
>>
>> > The version in the topic also implies a higher version than the
>> > unstable upload, whereas the stable upload needs a lower version -
>> > either -6.3+deb12u1 or -6.4~deb12u1 depending on whether you take
>> > the
>> > approach of adding the new patches on top of the existing stable
>> > version, or backporting the unstable upload as a whole. It looks
>> > like
>> > the effect would be identical in this case afaict, so it's purely a
>> > matter of preference.
>>
>> I will useg -6.4~deb12u1 for simplicity, since we are tracking the
>> unstable version in this update. I inadvertently made an error in
>> the bug report subject line.
>
> Sorry for missing a detail here, but if you're going for that approach
> then the changelog should follow the style it would for an upload to
> backports - i.e. taking the unstable upload, including the changelog
> entry for -6.4, and prepending a new stanza for -6.4~deb12u1 with an
> entry similar to "Rebuild for bookworm". Does that make sense?
>
> Regards,
>
> Adam
Yes, that makes sense to me. First time I'm proposing a new stable update
package that isn't a security update, so appreciate the patience and
assistance!
diff -Nru rss-glx-0.9.1/debian/changelog rss-glx-0.9.1/debian/changelog
--- rss-glx-0.9.1/debian/changelog 2021-10-16 08:11:19.000000000 -0500
+++ rss-glx-0.9.1/debian/changelog 2024-01-29 11:26:00.000000000 -0600
@@ -1,3 +1,18 @@
+rss-glx (0.9.1-6.4~deb12u1) bookworm; urgency=medium
+
+ * Rebuild for Bookworm (Closes: #1061652)
+
+ -- Timothy Pearson <tpear...@raptorengineering.com> Mon, 29 Jan 2024 11:26:00 -0600
+
+rss-glx (0.9.1-6.4) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/glfinish.patch: Call GLFinish() prior to glXSwapBuffers()
+ (Closes: #1061507)
+ * Install screensavers into /usr/libexec/xscreensaver (Closes: #979490)
+
+ -- Timothy Pearson <tpear...@raptorengineering.com> Sat, 27 Jan 2024 08:41:00 -0600
+
rss-glx (0.9.1-6.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru rss-glx-0.9.1/debian/patches/glfinish.patch rss-glx-0.9.1/debian/patches/glfinish.patch
--- rss-glx-0.9.1/debian/patches/glfinish.patch 1969-12-31 18:00:00.000000000 -0600
+++ rss-glx-0.9.1/debian/patches/glfinish.patch 2024-01-25 10:43:27.000000000 -0600
@@ -0,0 +1,12 @@
+Index: rss-glx-0.9.1/src/driver.c
+===================================================================
+--- rss-glx-0.9.1.orig/src/driver.c
++++ rss-glx-0.9.1/src/driver.c
+@@ -238,6 +238,7 @@
+
+ if (drawEnabled) {
+ hack_draw (XStuff, (double)now.tv_sec + now.tv_usec / 1000000.0f, frameTimeSoFar / 1000000.0f);
++ glFinish();
+
+ glXSwapBuffers (XStuff->display, XStuff->window);
+ }
diff -Nru rss-glx-0.9.1/debian/patches/series rss-glx-0.9.1/debian/patches/series
--- rss-glx-0.9.1/debian/patches/series 2021-10-16 08:05:56.000000000 -0500
+++ rss-glx-0.9.1/debian/patches/series 2024-01-27 08:46:13.000000000 -0600
@@ -2,3 +2,4 @@
pixelcity-cpp.patch
readme.patch
include-cstddef.patch
+glfinish.patch
diff -Nru rss-glx-0.9.1/debian/rules rss-glx-0.9.1/debian/rules
--- rss-glx-0.9.1/debian/rules 2011-05-27 10:01:25.000000000 -0500
+++ rss-glx-0.9.1/debian/rules 2024-01-27 08:45:36.000000000 -0600
@@ -15,12 +15,12 @@
override_dh_auto_configure:
dh_auto_configure -- --with-configdir=/usr/share/xscreensaver/config \
--with-kdessconfigdir=/usr/share/kde4/services/ScreenSavers \
- --bindir=/usr/lib/xscreensaver --enable-static=no \
+ --bindir=/usr/libexec/xscreensaver --enable-static=no \
LDFLAGS=-Wl,--as-needed
override_dh_auto_install:
dh_auto_install
- mv $(CURDIR)/debian/rss-glx/usr/lib/xscreensaver/rss-glx_install.pl \
+ mv $(CURDIR)/debian/rss-glx/usr/libexec/xscreensaver/rss-glx_install.pl \
$(CURDIR)/debian/rss-glx/usr/bin/rss-glx_install
cp $(CURDIR)/debian/desktop_files/*.desktop \
$(CURDIR)/debian/rss-glx/usr/share/applications/screensavers
