[Pkg-wmaker-commits] [wmaker] 01/01: Patch back libwraster symbol version to LIBWRASTER3

Andreas Metzler ametzler at moszumanska.debian.org
Thu Jan 21 06:38:05 UTC 2016


This is an automated email from the git hooks/post-receive script.

ametzler pushed a commit to branch master
in repository wmaker.

commit 19b7b0eb6e131c57a57365b492ad4a4916d2e9a7
Author: Andreas Metzler <ametzler at bebt.de>
Date:   Wed Jan 20 20:32:11 2016 +0100

    Patch back libwraster symbol version to LIBWRASTER3
    
    Temporarily mark RDrawLine at LIBWRASTER3 with a dep >= 0.95.7-3~ to force
    lockstep upgrades from broken 0.95.7-2. Closes: #811304
---
 debian/changelog                                   |   8 ++
 debian/libwraster5.symbols                         | 120 ++++++++++-----------
 .../patches/60_fix_wraster_symbol_versioning.diff  |  28 +++++
 debian/patches/series                              |   1 +
 4 files changed, 97 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e85a3ab..ea1fce6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+wmaker (0.95.7-3) unstable; urgency=low
+
+  * Patch back libwraster symbol version to LIBWRASTER3. Temporarily mark
+    RDrawLine at LIBWRASTER3 with a dep >= 0.95.7-3~ to force lockstep upgrades
+    from broken 0.95.7-2. Closes: #811304
+
+ -- Andreas Metzler <ametzler at debian.org>  Wed, 20 Jan 2016 20:19:27 +0100
+
 wmaker (0.95.7-2) unstable; urgency=medium
 
   [ Andreas Metzler ]
diff --git a/debian/libwraster5.symbols b/debian/libwraster5.symbols
index 366428f..f0a575f 100644
--- a/debian/libwraster5.symbols
+++ b/debian/libwraster5.symbols
@@ -1,61 +1,61 @@
 libwraster.so.5 libwraster5 #MINVER#
- LIBWRASTER5 at LIBWRASTER5 0.95.6
- RBevelImage at LIBWRASTER5 0.95.6
- RBlurImage at LIBWRASTER5 0.95.6
- RClearImage at LIBWRASTER5 0.95.6
- RCloneImage at LIBWRASTER5 0.95.6
- RCombineAlpha at LIBWRASTER5 0.95.6
- RCombineArea at LIBWRASTER5 0.95.6
- RCombineAreaWithOpaqueness at LIBWRASTER5 0.95.6
- RCombineImageWithColor at LIBWRASTER5 0.95.6
- RCombineImages at LIBWRASTER5 0.95.6
- RCombineImagesWithOpaqueness at LIBWRASTER5 0.95.6
- RConvertImage at LIBWRASTER5 0.95.6
- RConvertImageMask at LIBWRASTER5 0.95.6
- RCopyArea at LIBWRASTER5 0.95.6
- RCreateContext at LIBWRASTER5 0.95.6
- RCreateImage at LIBWRASTER5 0.95.6
- RCreateImageFromDrawable at LIBWRASTER5 0.95.6
- RCreateImageFromXImage at LIBWRASTER5 0.95.6
- RCreateXImage at LIBWRASTER5 0.95.6
- RDestroyContext at LIBWRASTER5 0.95.6
- RDestroyXImage at LIBWRASTER5 0.95.6
- RDrawLine at LIBWRASTER5 0.95.6
- RDrawLines at LIBWRASTER5 0.95.6
- RDrawSegments at LIBWRASTER5 0.95.6
- RErrorCode at LIBWRASTER5 0.95.6
- RFillImage at LIBWRASTER5 0.95.6
- RFlipImage at LIBWRASTER5 0.95.6
- RGetClosestXColor at LIBWRASTER5 0.95.6
- RGetImageFileFormat at LIBWRASTER5 0.95.6
- RGetImageFromXPMData at LIBWRASTER5 0.95.6
- RGetPixel at LIBWRASTER5 0.95.6
- RGetSubImage at LIBWRASTER5 0.95.6
- RGetXImage at LIBWRASTER5 0.95.6
- RHSVtoRGB at LIBWRASTER5 0.95.6
- RLightImage at LIBWRASTER5 0.95.6
- RLoadImage at LIBWRASTER5 0.95.6
- RMakeCenteredImage at LIBWRASTER5 0.95.6
- RMakeTiledImage at LIBWRASTER5 0.95.6
- RMessageForError at LIBWRASTER5 0.95.6
- ROperateLine at LIBWRASTER5 0.95.6
- ROperateLines at LIBWRASTER5 0.95.6
- ROperatePixel at LIBWRASTER5 0.95.6
- ROperatePixels at LIBWRASTER5 0.95.6
- ROperateRectangle at LIBWRASTER5 0.95.6
- ROperateSegments at LIBWRASTER5 0.95.6
- RPutPixel at LIBWRASTER5 0.95.6
- RPutPixels at LIBWRASTER5 0.95.6
- RPutXImage at LIBWRASTER5 0.95.6
- RRGBtoHSV at LIBWRASTER5 0.95.6
- RReleaseImage at LIBWRASTER5 0.95.6
- RRenderGradient at LIBWRASTER5 0.95.6
- RRenderInterwovenGradient at LIBWRASTER5 0.95.6
- RRenderMultiGradient at LIBWRASTER5 0.95.6
- RRetainImage at LIBWRASTER5 0.95.6
- RRotateImage at LIBWRASTER5 0.95.6
- RSaveImage at LIBWRASTER5 0.95.6
- RScaleImage at LIBWRASTER5 0.95.6
- RShutdown at LIBWRASTER5 0.95.6
- RSmoothScaleImage at LIBWRASTER5 0.95.6
- RSupportedFileFormats at LIBWRASTER5 0.95.6
+ LIBWRASTER3 at LIBWRASTER3 0.95.6
+ RBevelImage at LIBWRASTER3 0.95.6
+ RBlurImage at LIBWRASTER3 0.95.6
+ RClearImage at LIBWRASTER3 0.95.6
+ RCloneImage at LIBWRASTER3 0.95.6
+ RCombineAlpha at LIBWRASTER3 0.95.6
+ RCombineArea at LIBWRASTER3 0.95.6
+ RCombineAreaWithOpaqueness at LIBWRASTER3 0.95.6
+ RCombineImageWithColor at LIBWRASTER3 0.95.6
+ RCombineImages at LIBWRASTER3 0.95.6
+ RCombineImagesWithOpaqueness at LIBWRASTER3 0.95.6
+ RConvertImage at LIBWRASTER3 0.95.6
+ RConvertImageMask at LIBWRASTER3 0.95.6
+ RCopyArea at LIBWRASTER3 0.95.6
+ RCreateContext at LIBWRASTER3 0.95.6
+ RCreateImage at LIBWRASTER3 0.95.6
+ RCreateImageFromDrawable at LIBWRASTER3 0.95.6
+ RCreateImageFromXImage at LIBWRASTER3 0.95.6
+ RCreateXImage at LIBWRASTER3 0.95.6
+ RDestroyContext at LIBWRASTER3 0.95.6
+ RDestroyXImage at LIBWRASTER3 0.95.6
+ RDrawLine at LIBWRASTER3 0.95.7-3~
+ RDrawLines at LIBWRASTER3 0.95.6
+ RDrawSegments at LIBWRASTER3 0.95.6
+ RErrorCode at LIBWRASTER3 0.95.6
+ RFillImage at LIBWRASTER3 0.95.6
+ RFlipImage at LIBWRASTER3 0.95.6
+ RGetClosestXColor at LIBWRASTER3 0.95.6
+ RGetImageFileFormat at LIBWRASTER3 0.95.6
+ RGetImageFromXPMData at LIBWRASTER3 0.95.6
+ RGetPixel at LIBWRASTER3 0.95.6
+ RGetSubImage at LIBWRASTER3 0.95.6
+ RGetXImage at LIBWRASTER3 0.95.6
+ RHSVtoRGB at LIBWRASTER3 0.95.6
+ RLightImage at LIBWRASTER3 0.95.6
+ RLoadImage at LIBWRASTER3 0.95.6
+ RMakeCenteredImage at LIBWRASTER3 0.95.6
+ RMakeTiledImage at LIBWRASTER3 0.95.6
+ RMessageForError at LIBWRASTER3 0.95.6
+ ROperateLine at LIBWRASTER3 0.95.6
+ ROperateLines at LIBWRASTER3 0.95.6
+ ROperatePixel at LIBWRASTER3 0.95.6
+ ROperatePixels at LIBWRASTER3 0.95.6
+ ROperateRectangle at LIBWRASTER3 0.95.6
+ ROperateSegments at LIBWRASTER3 0.95.6
+ RPutPixel at LIBWRASTER3 0.95.6
+ RPutPixels at LIBWRASTER3 0.95.6
+ RPutXImage at LIBWRASTER3 0.95.6
+ RRGBtoHSV at LIBWRASTER3 0.95.6
+ RReleaseImage at LIBWRASTER3 0.95.6
+ RRenderGradient at LIBWRASTER3 0.95.6
+ RRenderInterwovenGradient at LIBWRASTER3 0.95.6
+ RRenderMultiGradient at LIBWRASTER3 0.95.6
+ RRetainImage at LIBWRASTER3 0.95.6
+ RRotateImage at LIBWRASTER3 0.95.6
+ RSaveImage at LIBWRASTER3 0.95.6
+ RScaleImage at LIBWRASTER3 0.95.6
+ RShutdown at LIBWRASTER3 0.95.6
+ RSmoothScaleImage at LIBWRASTER3 0.95.6
+ RSupportedFileFormats at LIBWRASTER3 0.95.6
diff --git a/debian/patches/60_fix_wraster_symbol_versioning.diff b/debian/patches/60_fix_wraster_symbol_versioning.diff
new file mode 100644
index 0000000..5f33b8a
--- /dev/null
+++ b/debian/patches/60_fix_wraster_symbol_versioning.diff
@@ -0,0 +1,28 @@
+Description: Patch back libwraster symbol version to LIBWRASTER3.
+Author: Andreas Metzler <ametzler at debian.org>
+Bug-Debian: https://bugs.debian.org/811304
+Origin: vendor
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,6 +76,11 @@ WRASTER_REVISION=0
+ WRASTER_AGE=0
+ WRASTER_VERSION=$WRASTER_CURRENT:$WRASTER_REVISION:$WRASTER_AGE
+ AC_SUBST(WRASTER_VERSION)
++dnl After next soname bump drop this and use WRASTER_VERSION as argument
++dnl for generate-mapfile-from-header.sh
++dnl http://bugs.debian.org/811304
++WRASTER_SYMBOL_VERSION=3
++AC_SUBST([WRASTER_SYMBOL_VERSION])
+ dnl
+ dnl libWINGs
+ WINGS_CURRENT=4
+--- a/wrlib/Makefile.am
++++ b/wrlib/Makefile.am
+@@ -99,5 +99,5 @@ wrlib.pc: Makefile
+ if HAVE_LD_VERSION_SCRIPT
+ libwraster.map: $(include_HEADERS) $(top_srcdir)/script/generate-mapfile-from-header.sh
+ 	$(AM_V_GEN)$(top_srcdir)/script/generate-mapfile-from-header.sh \
+-		-n LIBWRASTER -v $(WRASTER_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
++		-n LIBWRASTER -v $(WRASTER_SYMBOL_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index 7032d1d..521078c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 54_Debian_wmmacros.diff
 55_ungif_problem.diff
 56_ignore_runstatedir.diff
+60_fix_wraster_symbol_versioning.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmaker.git



More information about the Pkg-wmaker-commits mailing list