xscreensaver 6.13, with changes broken down

Makefile.in

@@ -14,10 +14,22 @@ TARFILES	= README README.hacking INSTALL \
 		  install-sh config.guess config.rpath aclocal.m4 \
 		  ax_pthread.m4 config.sub \
 		  intltool-merge.in intltool-extract.in intltool-update.in \
-		  xscreensaver.spec
+		  xscreensaver.spec $(DEBFILES)
 
-TAR		= gnutar
-TAR_ARGS	= --owner=0 --group=0 --posix --no-acls --no-xattrs --no-selinux
+DEBFILES	= debian/changelog \
+		  debian/control \
+		  debian/copyright \
+		  debian/docs \
+		  debian/postinst \
+		  debian/prerm \
+		  debian/README \
+		  debian/rules \
+		  debian/source/format \
+		  debian/watch
+
+TAR		= @TAR@
+TAR_ARGS	= -v --owner=0 --group=0 --posix --no-acls --no-xattrs --no-selinux
+TAR_DIR		= archive
 
 
 # Using $(MAKE) directly means the shell executes things even with "make -n"
@@ -83,7 +95,8 @@ _tar:
   NAME="xscreensaver-$$VERS" ;						    \
   rm -rf $$NAME ; ln -s . $$NAME ;					    \
   LIST="tar$$$$.txt" ;							    \
-  ADIR=archive/ ;							    \
+  ADIR="$(TAR_DIR)" ;							    \
+  [ -d "$$ADIR" ] || mkdir "$$ADIR" ;					    \
   rm -f "$$LIST" ;							    \
   for subdir in . $(SUBDIRS2) ; do					    \
     ( cd $$subdir ;							    \
@@ -93,10 +106,10 @@ _tar:
         | sed -e "s@/\./@/@g"						    \
     ) >> "$$LIST" ;							    \
   done ;								    \
-  echo creating tar file $$ADIR$$NAME.tar.gz... ;			    \
+  echo creating tar file $$ADIR/$$NAME.tar.gz... ;			    \
   export COPYFILE_DISABLE=true ;					    \
   export GZIP="-9v" ;							    \
-  $(TAR) -vczf $$ADIR$$NAME.tar.gz -T "$$LIST" $(TAR_ARGS) ;		    \
+  $(TAR) -czf $$ADIR/$$NAME.tar.gz -T "$$LIST" $(TAR_ARGS) ;		    \
   rm "$$LIST" "$$NAME"
 
 
@@ -234,20 +247,25 @@ version-date::
 
 
 update_spec_version::
-	@S=$(srcdir)/xscreensaver.spec ;				    \
+	@								    \
+	S1=$(srcdir)/xscreensaver.spec ;				    \
+	S2=$(srcdir)/debian/changelog ;					    \
 	U=$(srcdir)/utils/version.h ;					    \
 	VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U |	    \
 	  head -1` ;							    \
-	/bin/echo -n "Updating $$S to \"$$VERS\"... " ;			    \
 	T=/tmp/xs.$$$$ ;						    \
-	sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$VERS/"		    \
-	  < $$S > $$T ;							    \
-	if cmp -s $$S $$T ; then					    \
-	  echo "unchanged." ;						    \
-	else								    \
-	  cat $$T > $$S ;						    \
-	  echo "done." ;						    \
-	fi ;								    \
+	for F in "$$S1" "$$S2" ; do					    \
+	  /bin/echo -n "Updating $$F to \"$$VERS\"... " ;		    \
+	  sed -e "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$VERS/"	    \
+	      -e "s/([-0-9.]*)/($$VERS-1)/"				    \
+	    < "$$F" > "$$T" ;						    \
+	  if cmp -s "$$F" "$$T" ; then					    \
+	    echo "unchanged." ;						    \
+	  else								    \
+	    cat "$$T" > "$$F" ;						    \
+	    echo "done." ;						    \
+	  fi ;								    \
+	done ;								    \
 	rm $$T
 
 rpm::
@@ -259,7 +277,7 @@ rpm::
   ADIR=archive/ ;							   \
   TGZ=xscreensaver-$$VERS.tar.gz ;					   \
   if [ ! -f $${ADIR}$$TGZ ]; then					   \
-    echo "$${ADIR}$$TGZ does not exist!  Did you forget to \`make tar'?" ; \
+    echo "$${ADIR}$$TGZ does not exist: do 'make tar' first." ;		   \
     exit 1 ; 								   \
   fi ;									   \
   rm -rf /var/tmp/xscreensaver-$$VERS-root ;				   \
@@ -284,6 +302,39 @@ rpm::
   echo '' ;								   \
   ls -lFG xscreensaver*-$$VERS-*.rpm
 
+deb::
+	@								   \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h |  \
+	  head -1` ;							   \
+  DIR=debian/build ;							   \
+  ADIR=archive/ ;							   \
+  TGZ=xscreensaver-$$VERS.tar.gz ;					   \
+  TGZ2=xscreensaver_$$VERS.orig.tar.gz ;				   \
+  if [ ! -f $${ADIR}$$TGZ ]; then					   \
+    echo "$${ADIR}$$TGZ does not exist: do 'make tar' first." ;		   \
+    exit 1 ; 								   \
+  fi ;									   \
+									   \
+  set -e ;								   \
+  set -x ;								   \
+  rm -rf $$DIR ;							   \
+  mkdir $$DIR ;								   \
+  cp -p "$${ADIR}$$TGZ" "$$DIR/$$TGZ2" ;				   \
+									   \
+  ( cd $$DIR ;								   \
+    $(TAR) -zxf "$$TGZ2" ;						   \
+    cd xscreensaver-$$VERS ;						   \
+    dpkg-buildpackage -us -uc ;						   \
+  ) ;									   \
+  set +x ;								   \
+  echo '' ;								   \
+  echo 'DEB build complete' ;						   \
+  echo '' ;								   \
+  rm -rf "$$DIR/xscreensaver-$$VERS" ;					   \
+  rm -f  "$$DIR/$$TGZ2" ;						   \
+  echo '' ;								   \
+  ls -lFGd "$$DIR/xscreensaver"*
+
 dmg::
 	$(MAKE2) -C OSX release dmg
 apk::
@@ -458,12 +509,10 @@ install_links::
 
 
 cerebrum::
-	rsync -vax . 10.0.1.37:xscreensaver/ \
+	rsync -vax . 10.0.1.42:xscreensaver/ \
 	--omit-dir-times \
 	--delete-during \
 	--exclude .git \
-	--exclude OSX \
-	--exclude android \
 	--exclude archive \
 	--exclude build \
 	--exclude gen \
@@ -473,10 +522,12 @@ cerebrum::
 	--include xscreensaver-getimage-file \
 	--include xscreensaver-getimage-video \
 	--include xscreensaver-text \
-	--exclude xscreensaver-5.45 \
-	--exclude xscreensaver-6.00 \
-	--exclude xscreensaver-6.01 \
-	--exclude xscreensaver-6.02 \
+	--exclude android/gradle \
+	--exclude android/xscreensaver/obj \
+	--exclude android/xscreensaver/res \
+	--exclude android/xscreensaver/libs \
+	--exclude android/.gradle \
+	--exclude android/.idea \
 	--exclude '*~' \
 	--include '*.asm' \
 	--include '*.c' \
@@ -508,6 +559,20 @@ cerebrum::
 	--include 'ad2c' \
 	--include 'vidwhacker' \
 	--include 'webcollage' \
+	--include 'debian/*' \
+	--include 'README' \
+	--include 'README.hacking' \
+	--include 'INSTALL' \
+	--include 'ChangeLog' \
+	--include '*.pdf' \
+	--include '*.pov' \
+	--include '*.txt' \
+	--include '*.tex' \
+	--include '*.dxf' \
+	--include '*.dtd' \
+	--include '*.xsd' \
+	--include '*.pbxproj' \
+	--include '.gdbinit' \
 	--include '*/' \
 	--exclude '*'
 

OSX/Randomizer.plist

@@ -17,20 +17,20 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSPrincipalClass</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.entertainment</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleLongVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleGetInfoString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>6.12</string>
+	<string>6.13</string>
 </dict>
 </plist>

OSX/SaverRunner.plist

@@ -17,21 +17,21 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.entertainment</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleLongVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleGetInfoString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSMainNibFile</key>
 	<string>SaverRunner</string>
 	<key>CFBundleIconFile</key>

OSX/Updater.plist

@@ -17,21 +17,21 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.entertainment</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleLongVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleGetInfoString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSMainNibFile</key>
 	<string>Updater</string>
 	<key>CFBundleIconFile</key>

OSX/XScreenSaver.plist

@@ -17,21 +17,21 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSPrincipalClass</key>
 	<string>XScreenSaver${EXECUTABLE_NAME}View</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.entertainment</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleLongVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleGetInfoString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSMainNibFile</key>
 	<string>SaverRunner</string>
 </dict>

OSX/bindist.rtf

@@ -16,8 +16,8 @@
 \b0 by Jamie Zawinski\
 and many others\
 \
-version 6.12\
-07-Jul-2025\
+version 6.13\
+02-Dec-2025\
 \
 {\field{\*\fldinst{HYPERLINK "https://www.jwz.org/xscreensaver/"}}{\fldrslt \cf2 \ul \ulc2 https://www.jwz.org/xscreensaver/}}\
 \pard\pardeftab720

OSX/iSaverRunner.plist

@@ -17,17 +17,17 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.entertainment</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleLongVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleGetInfoString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSMainNibFile</key>
 	<string>iSaverRunner</string>
 	<key>CFBundleDisplayName</key>

OSX/tvSaverRunner.plist

@@ -17,17 +17,17 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.entertainment</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleLongVersionString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleGetInfoString</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>6.12</string>
+	<string>6.13</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleIcons</key>

OSX/updates.xml

@@ -7,6 +7,17 @@
   <link>https://www.jwz.org/xscreensaver/updates.xml</link>
   <description>Updates to xscreensaver.</description>
   <language>en</language>
+  <item>
+   <title>Version 6.13</title>
+   <link>https://www.jwz.org/xscreensaver/xscreensaver-6.13.dmg</link>
+   <description><![CDATA[&bull; Added a number of historical full chess games to `endgame`. <BR>&bull; Rewrote `glslideshow' to add more image-transition effects. <BR>&bull; Hacks that display images and their filenames will display their titles intead, if the image originated in an RSS feed (or has the "user.dublincore.title" xattr). ]]></description>
+   <pubDate>Tue, 02 Dec 2025 17:09:25 -0800</pubDate>
+   <enclosure url="https://www.jwz.org/xscreensaver/xscreensaver-6.13.dmg"
+    sparkle:version="6.13"
+    sparkle:edSignature="zQn7puQXjOWX0VQ05W9IUETdCkfAWOtugFaeqKnWT5E4d5+GCV1Aq6DMSOMqXzKjisKCXcsqAz5duVp7P8/kDw=="
+    length="102813232"
+    type="application/octet-stream" />
+  </item>
   <item>
    <title>Version 6.10</title>
    <link>https://www.jwz.org/xscreensaver/xscreensaver-6.10.dmg</link>