diff -Nru wmaker-0.96.0/debian/changelog wmaker-0.96.0/debian/changelog --- wmaker-0.96.0/debian/changelog 2023-08-10 12:00:40.000000000 +0000 +++ wmaker-0.96.0/debian/changelog 2023-08-13 12:48:41.000000000 +0000 @@ -1,3 +1,12 @@ +wmaker (0.96.0-2) unstable; urgency=medium + + * debian/libwraster6.symbols + - Drop symbol versions back to LIBWRASTER6. + * debian/patches/10_libwraster6.diff + - New patch; fix libwraster symbol version (Closes: #1043417). + + -- Doug Torrance Sun, 13 Aug 2023 08:48:41 -0400 + wmaker (0.96.0-1) unstable; urgency=medium * New upstream release. diff -Nru wmaker-0.96.0/debian/libwraster6.symbols wmaker-0.96.0/debian/libwraster6.symbols --- wmaker-0.96.0/debian/libwraster6.symbols 2023-08-10 11:59:56.000000000 +0000 +++ wmaker-0.96.0/debian/libwraster6.symbols 2023-08-10 21:53:39.000000000 +0000 @@ -1,63 +1,63 @@ libwraster.so.6 libwraster6 #MINVER# * Build-Depends-Package: libwraster-dev - LIBWRASTER7@LIBWRASTER7 0.95.8 - RBevelImage@LIBWRASTER7 0.95.8 - RBlurImage@LIBWRASTER7 0.95.8 - RClearImage@LIBWRASTER7 0.95.8 - RCloneImage@LIBWRASTER7 0.95.8 - RCombineAlpha@LIBWRASTER7 0.95.8 - RCombineArea@LIBWRASTER7 0.95.8 - RCombineAreaWithOpaqueness@LIBWRASTER7 0.95.8 - RCombineImageWithColor@LIBWRASTER7 0.95.8 - RCombineImages@LIBWRASTER7 0.95.8 - RCombineImagesWithOpaqueness@LIBWRASTER7 0.95.8 - RConvertImage@LIBWRASTER7 0.95.8 - RConvertImageMask@LIBWRASTER7 0.95.8 - RCopyArea@LIBWRASTER7 0.95.8 - RCreateContext@LIBWRASTER7 0.95.8 - RCreateImage@LIBWRASTER7 0.95.8 - RCreateImageFromDrawable@LIBWRASTER7 0.95.8 - RCreateImageFromXImage@LIBWRASTER7 0.95.8 - RCreateXImage@LIBWRASTER7 0.95.8 - RDestroyContext@LIBWRASTER7 0.95.8 - RDestroyXImage@LIBWRASTER7 0.95.8 - RDrawLine@LIBWRASTER7 0.95.8 - RDrawLines@LIBWRASTER7 0.95.8 - RDrawSegments@LIBWRASTER7 0.95.8 - RErrorCode@LIBWRASTER7 0.95.8 - RFillImage@LIBWRASTER7 0.95.8 - RFlipImage@LIBWRASTER7 0.95.8 - RGetClosestXColor@LIBWRASTER7 0.95.8 - RGetImageFileFormat@LIBWRASTER7 0.95.8 - RGetImageFromXPMData@LIBWRASTER7 0.95.8 - RGetPixel@LIBWRASTER7 0.95.8 - RGetSubImage@LIBWRASTER7 0.95.8 - RGetXImage@LIBWRASTER7 0.95.8 - RHSVtoRGB@LIBWRASTER7 0.95.8 - RLightImage@LIBWRASTER7 0.95.8 - RLoadImage@LIBWRASTER7 0.95.8 - RMakeCenteredImage@LIBWRASTER7 0.95.8 - RMakeTiledImage@LIBWRASTER7 0.95.8 - RMessageForError@LIBWRASTER7 0.95.8 - ROperateLine@LIBWRASTER7 0.95.8 - ROperateLines@LIBWRASTER7 0.95.8 - ROperatePixel@LIBWRASTER7 0.95.8 - ROperatePixels@LIBWRASTER7 0.95.8 - ROperateRectangle@LIBWRASTER7 0.95.8 - ROperateSegments@LIBWRASTER7 0.95.8 - RPutPixel@LIBWRASTER7 0.95.8 - RPutPixels@LIBWRASTER7 0.95.8 - RPutXImage@LIBWRASTER7 0.95.8 - RRGBtoHSV@LIBWRASTER7 0.95.8 - RReleaseImage@LIBWRASTER7 0.95.8 - RRenderGradient@LIBWRASTER7 0.95.8 - RRenderInterwovenGradient@LIBWRASTER7 0.95.8 - RRenderMultiGradient@LIBWRASTER7 0.95.8 - RRetainImage@LIBWRASTER7 0.95.8 - RRotateImage@LIBWRASTER7 0.95.8 - RSaveImage@LIBWRASTER7 0.95.8 - RSaveTitledImage@LIBWRASTER7 0.96.0 - RScaleImage@LIBWRASTER7 0.95.8 - RShutdown@LIBWRASTER7 0.95.8 - RSmoothScaleImage@LIBWRASTER7 0.95.8 - RSupportedFileFormats@LIBWRASTER7 0.95.8 + LIBWRASTER6@LIBWRASTER6 0.95.8 + RBevelImage@LIBWRASTER6 0.95.8 + RBlurImage@LIBWRASTER6 0.95.8 + RClearImage@LIBWRASTER6 0.95.8 + RCloneImage@LIBWRASTER6 0.95.8 + RCombineAlpha@LIBWRASTER6 0.95.8 + RCombineArea@LIBWRASTER6 0.95.8 + RCombineAreaWithOpaqueness@LIBWRASTER6 0.95.8 + RCombineImageWithColor@LIBWRASTER6 0.95.8 + RCombineImages@LIBWRASTER6 0.95.8 + RCombineImagesWithOpaqueness@LIBWRASTER6 0.95.8 + RConvertImage@LIBWRASTER6 0.95.8 + RConvertImageMask@LIBWRASTER6 0.95.8 + RCopyArea@LIBWRASTER6 0.95.8 + RCreateContext@LIBWRASTER6 0.95.8 + RCreateImage@LIBWRASTER6 0.95.8 + RCreateImageFromDrawable@LIBWRASTER6 0.95.8 + RCreateImageFromXImage@LIBWRASTER6 0.95.8 + RCreateXImage@LIBWRASTER6 0.95.8 + RDestroyContext@LIBWRASTER6 0.95.8 + RDestroyXImage@LIBWRASTER6 0.95.8 + RDrawLine@LIBWRASTER6 0.95.8 + RDrawLines@LIBWRASTER6 0.95.8 + RDrawSegments@LIBWRASTER6 0.95.8 + RErrorCode@LIBWRASTER6 0.95.8 + RFillImage@LIBWRASTER6 0.95.8 + RFlipImage@LIBWRASTER6 0.95.8 + RGetClosestXColor@LIBWRASTER6 0.95.8 + RGetImageFileFormat@LIBWRASTER6 0.95.8 + RGetImageFromXPMData@LIBWRASTER6 0.95.8 + RGetPixel@LIBWRASTER6 0.95.8 + RGetSubImage@LIBWRASTER6 0.95.8 + RGetXImage@LIBWRASTER6 0.95.8 + RHSVtoRGB@LIBWRASTER6 0.95.8 + RLightImage@LIBWRASTER6 0.95.8 + RLoadImage@LIBWRASTER6 0.95.8 + RMakeCenteredImage@LIBWRASTER6 0.95.8 + RMakeTiledImage@LIBWRASTER6 0.95.8 + RMessageForError@LIBWRASTER6 0.95.8 + ROperateLine@LIBWRASTER6 0.95.8 + ROperateLines@LIBWRASTER6 0.95.8 + ROperatePixel@LIBWRASTER6 0.95.8 + ROperatePixels@LIBWRASTER6 0.95.8 + ROperateRectangle@LIBWRASTER6 0.95.8 + ROperateSegments@LIBWRASTER6 0.95.8 + RPutPixel@LIBWRASTER6 0.95.8 + RPutPixels@LIBWRASTER6 0.95.8 + RPutXImage@LIBWRASTER6 0.95.8 + RRGBtoHSV@LIBWRASTER6 0.95.8 + RReleaseImage@LIBWRASTER6 0.95.8 + RRenderGradient@LIBWRASTER6 0.95.8 + RRenderInterwovenGradient@LIBWRASTER6 0.95.8 + RRenderMultiGradient@LIBWRASTER6 0.95.8 + RRetainImage@LIBWRASTER6 0.95.8 + RRotateImage@LIBWRASTER6 0.95.8 + RSaveImage@LIBWRASTER6 0.95.8 + RSaveTitledImage@LIBWRASTER6 0.96.0 + RScaleImage@LIBWRASTER6 0.95.8 + RShutdown@LIBWRASTER6 0.95.8 + RSmoothScaleImage@LIBWRASTER6 0.95.8 + RSupportedFileFormats@LIBWRASTER6 0.95.8 diff -Nru wmaker-0.96.0/debian/patches/10_libwraster6.diff wmaker-0.96.0/debian/patches/10_libwraster6.diff --- wmaker-0.96.0/debian/patches/10_libwraster6.diff 1970-01-01 00:00:00.000000000 +0000 +++ wmaker-0.96.0/debian/patches/10_libwraster6.diff 2023-08-13 12:47:25.000000000 +0000 @@ -0,0 +1,41 @@ +Description: Fix calculation of version number in the library mapfiles +Author: Christophe CURIS +Origin: https://repo.or.cz/wmaker-crm.git/commitdiff/2264ed9 +Bug-Debian: https://bugs.debian.org/1043417 +Last-Update: 2023-08-13 + +--- a/script/generate-mapfile-from-header.sh ++++ b/script/generate-mapfile-from-header.sh +@@ -77,10 +77,8 @@ + + -v) + shift +- # Version may be 'x:y:z', we keep only 'x' +- version="`echo "$1" | sed -e 's,:.*$,,' `" +- # the version should only be a number +- echo "$version" | grep '^[1-9][0-9]*$' > /dev/null || \ ++ version="$1" ++ echo "$version" | grep -E '^[1-9][0-9]*(:[0-9]+(:[0-9]+)?)?$' > /dev/null || \ + arg_error "version \"$1\" is not valid" + ;; + +@@ -109,9 +107,18 @@ + # generate the rest of the script so that other symbols will not be kept. + awk ' + BEGIN { ++ # Version number here uses only 1 number from the full version used in libtool ++ libversion="'"$version"'"; ++ if (split(libversion, subversions, ":") > 1) { ++ # Calculate [CURRENT - AGE], the goal is that the number will not ++ # change when functions are added to the API, but it will be incremented ++ # when functions are removed or argument change (which breaks compat) ++ libversion = subversions[1] - subversions[3]; ++ } ++ + print "/* Generated version-script for ld */"; + print ""; +- print "'"$libname$version"'"; ++ print "'"$libname"'" libversion; + print "{"; + print " global:"; + } diff -Nru wmaker-0.96.0/debian/patches/series wmaker-0.96.0/debian/patches/series --- wmaker-0.96.0/debian/patches/series 2023-08-10 11:59:56.000000000 +0000 +++ wmaker-0.96.0/debian/patches/series 2023-08-13 12:45:28.000000000 +0000 @@ -1,2 +1,3 @@ +10_libwraster6.diff 53_Debian_WMState.diff 75_WPrefs_to_bindir_when_gnustedir_is_set.diff