This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 8b46f16205fb13dadbf495044b3d12a2d0d990e9 (commit)
via 2da2045efa0acd2c07fecd7b0e8b1e7f52864b3b (commit)
from 67e9e7e554bb7af7076bc39d1f922c57f7b1759c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/wmaker-crm.git/commit/8b46f16205fb13dadbf495044b3d12a2d0d990e9
commit 8b46f16205fb13dadbf495044b3d12a2d0d990e9
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Tue Feb 9 17:57:36 2016 -0500
debian: Update with version 0.95.7-3 packaging.
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@LIBWRASTER3 with a dep >= 0.95.7-3~ to force lockstep upgrades
+ from broken 0.95.7-2. Closes: #811304
+
+ -- Andreas Metzler <ametz...@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@LIBWRASTER5 0.95.6
- RBevelImage@LIBWRASTER5 0.95.6
- RBlurImage@LIBWRASTER5 0.95.6
- RClearImage@LIBWRASTER5 0.95.6
- RCloneImage@LIBWRASTER5 0.95.6
- RCombineAlpha@LIBWRASTER5 0.95.6
- RCombineArea@LIBWRASTER5 0.95.6
- RCombineAreaWithOpaqueness@LIBWRASTER5 0.95.6
- RCombineImageWithColor@LIBWRASTER5 0.95.6
- RCombineImages@LIBWRASTER5 0.95.6
- RCombineImagesWithOpaqueness@LIBWRASTER5 0.95.6
- RConvertImage@LIBWRASTER5 0.95.6
- RConvertImageMask@LIBWRASTER5 0.95.6
- RCopyArea@LIBWRASTER5 0.95.6
- RCreateContext@LIBWRASTER5 0.95.6
- RCreateImage@LIBWRASTER5 0.95.6
- RCreateImageFromDrawable@LIBWRASTER5 0.95.6
- RCreateImageFromXImage@LIBWRASTER5 0.95.6
- RCreateXImage@LIBWRASTER5 0.95.6
- RDestroyContext@LIBWRASTER5 0.95.6
- RDestroyXImage@LIBWRASTER5 0.95.6
- RDrawLine@LIBWRASTER5 0.95.6
- RDrawLines@LIBWRASTER5 0.95.6
- RDrawSegments@LIBWRASTER5 0.95.6
- RErrorCode@LIBWRASTER5 0.95.6
- RFillImage@LIBWRASTER5 0.95.6
- RFlipImage@LIBWRASTER5 0.95.6
- RGetClosestXColor@LIBWRASTER5 0.95.6
- RGetImageFileFormat@LIBWRASTER5 0.95.6
- RGetImageFromXPMData@LIBWRASTER5 0.95.6
- RGetPixel@LIBWRASTER5 0.95.6
- RGetSubImage@LIBWRASTER5 0.95.6
- RGetXImage@LIBWRASTER5 0.95.6
- RHSVtoRGB@LIBWRASTER5 0.95.6
- RLightImage@LIBWRASTER5 0.95.6
- RLoadImage@LIBWRASTER5 0.95.6
- RMakeCenteredImage@LIBWRASTER5 0.95.6
- RMakeTiledImage@LIBWRASTER5 0.95.6
- RMessageForError@LIBWRASTER5 0.95.6
- ROperateLine@LIBWRASTER5 0.95.6
- ROperateLines@LIBWRASTER5 0.95.6
- ROperatePixel@LIBWRASTER5 0.95.6
- ROperatePixels@LIBWRASTER5 0.95.6
- ROperateRectangle@LIBWRASTER5 0.95.6
- ROperateSegments@LIBWRASTER5 0.95.6
- RPutPixel@LIBWRASTER5 0.95.6
- RPutPixels@LIBWRASTER5 0.95.6
- RPutXImage@LIBWRASTER5 0.95.6
- RRGBtoHSV@LIBWRASTER5 0.95.6
- RReleaseImage@LIBWRASTER5 0.95.6
- RRenderGradient@LIBWRASTER5 0.95.6
- RRenderInterwovenGradient@LIBWRASTER5 0.95.6
- RRenderMultiGradient@LIBWRASTER5 0.95.6
- RRetainImage@LIBWRASTER5 0.95.6
- RRotateImage@LIBWRASTER5 0.95.6
- RSaveImage@LIBWRASTER5 0.95.6
- RScaleImage@LIBWRASTER5 0.95.6
- RShutdown@LIBWRASTER5 0.95.6
- RSmoothScaleImage@LIBWRASTER5 0.95.6
- RSupportedFileFormats@LIBWRASTER5 0.95.6
+ LIBWRASTER3@LIBWRASTER3 0.95.6
+ RBevelImage@LIBWRASTER3 0.95.6
+ RBlurImage@LIBWRASTER3 0.95.6
+ RClearImage@LIBWRASTER3 0.95.6
+ RCloneImage@LIBWRASTER3 0.95.6
+ RCombineAlpha@LIBWRASTER3 0.95.6
+ RCombineArea@LIBWRASTER3 0.95.6
+ RCombineAreaWithOpaqueness@LIBWRASTER3 0.95.6
+ RCombineImageWithColor@LIBWRASTER3 0.95.6
+ RCombineImages@LIBWRASTER3 0.95.6
+ RCombineImagesWithOpaqueness@LIBWRASTER3 0.95.6
+ RConvertImage@LIBWRASTER3 0.95.6
+ RConvertImageMask@LIBWRASTER3 0.95.6
+ RCopyArea@LIBWRASTER3 0.95.6
+ RCreateContext@LIBWRASTER3 0.95.6
+ RCreateImage@LIBWRASTER3 0.95.6
+ RCreateImageFromDrawable@LIBWRASTER3 0.95.6
+ RCreateImageFromXImage@LIBWRASTER3 0.95.6
+ RCreateXImage@LIBWRASTER3 0.95.6
+ RDestroyContext@LIBWRASTER3 0.95.6
+ RDestroyXImage@LIBWRASTER3 0.95.6
+ RDrawLine@LIBWRASTER3 0.95.7-3~
+ RDrawLines@LIBWRASTER3 0.95.6
+ RDrawSegments@LIBWRASTER3 0.95.6
+ RErrorCode@LIBWRASTER3 0.95.6
+ RFillImage@LIBWRASTER3 0.95.6
+ RFlipImage@LIBWRASTER3 0.95.6
+ RGetClosestXColor@LIBWRASTER3 0.95.6
+ RGetImageFileFormat@LIBWRASTER3 0.95.6
+ RGetImageFromXPMData@LIBWRASTER3 0.95.6
+ RGetPixel@LIBWRASTER3 0.95.6
+ RGetSubImage@LIBWRASTER3 0.95.6
+ RGetXImage@LIBWRASTER3 0.95.6
+ RHSVtoRGB@LIBWRASTER3 0.95.6
+ RLightImage@LIBWRASTER3 0.95.6
+ RLoadImage@LIBWRASTER3 0.95.6
+ RMakeCenteredImage@LIBWRASTER3 0.95.6
+ RMakeTiledImage@LIBWRASTER3 0.95.6
+ RMessageForError@LIBWRASTER3 0.95.6
+ ROperateLine@LIBWRASTER3 0.95.6
+ ROperateLines@LIBWRASTER3 0.95.6
+ ROperatePixel@LIBWRASTER3 0.95.6
+ ROperatePixels@LIBWRASTER3 0.95.6
+ ROperateRectangle@LIBWRASTER3 0.95.6
+ ROperateSegments@LIBWRASTER3 0.95.6
+ RPutPixel@LIBWRASTER3 0.95.6
+ RPutPixels@LIBWRASTER3 0.95.6
+ RPutXImage@LIBWRASTER3 0.95.6
+ RRGBtoHSV@LIBWRASTER3 0.95.6
+ RReleaseImage@LIBWRASTER3 0.95.6
+ RRenderGradient@LIBWRASTER3 0.95.6
+ RRenderInterwovenGradient@LIBWRASTER3 0.95.6
+ RRenderMultiGradient@LIBWRASTER3 0.95.6
+ RRetainImage@LIBWRASTER3 0.95.6
+ RRotateImage@LIBWRASTER3 0.95.6
+ RSaveImage@LIBWRASTER3 0.95.6
+ RScaleImage@LIBWRASTER3 0.95.6
+ RShutdown@LIBWRASTER3 0.95.6
+ RSmoothScaleImage@LIBWRASTER3 0.95.6
+ RSupportedFileFormats@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 <ametz...@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 b704e17..1cf82df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
53_Debian_WMState.diff
54_Debian_wmmacros.diff
55_ungif_problem.diff
+60_fix_wraster_symbol_versioning.diff
http://repo.or.cz/wmaker-crm.git/commit/2da2045efa0acd2c07fecd7b0e8b1e7f52864b3b
commit 2da2045efa0acd2c07fecd7b0e8b1e7f52864b3b
Author: Doug Torrance <dtorra...@piedmont.edu>
Date: Tue Feb 9 17:57:35 2016 -0500
debian: Remove 56_ignore_runstatedir.diff.
This patch has now been applied in next, so its presence among the Debian
patches would cause quilt to fail for those trying to build packages from
next.
diff --git a/debian/patches/56_ignore_runstatedir.diff
b/debian/patches/56_ignore_runstatedir.diff
deleted file mode 100644
index 4305bfc..0000000
--- a/debian/patches/56_ignore_runstatedir.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Ignore runstatedir in check-cmdline-options-doc.sh
- autoconf 2.70 will add a --runstatedir option, Debian has backported it.
- Ignore it when checking whether INSTALL is up to date.
-Author: Andreas Metzler <ametz...@debian.org>
-Origin: vendor
-
---- wmaker-0.95.7.orig/Makefile.am
-+++ wmaker-0.95.7/Makefile.am
-@@ -106,6 +106,7 @@ configure-documentation:
- --ignore-prg 'enable-shared,enable-static # should be in
INSTALL' \
- --ignore-prg 'disable-option-checking,enable-fast-install #
should be in INSTALL' \
- --ignore-prg
'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
-+ --ignore-prg 'runstatedir #new in autoconf 2.70, backported in
Debian' \
- --ignore-prg 'with-x # no use, it would not work without X'
-
- .PHONY: configure-documentation
diff --git a/debian/patches/series b/debian/patches/series
index 7032d1d..b704e17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@
53_Debian_WMState.diff
54_Debian_wmmacros.diff
55_ungif_problem.diff
-56_ignore_runstatedir.diff
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++
debian/libwraster5.symbols | 120 ++++++++++-----------
debian/patches/56_ignore_runstatedir.diff | 16 ---
.../patches/60_fix_wraster_symbol_versioning.diff | 28 +++++
debian/patches/series | 2 +-
5 files changed, 97 insertions(+), 77 deletions(-)
delete mode 100644 debian/patches/56_ignore_runstatedir.diff
create mode 100644 debian/patches/60_fix_wraster_symbol_versioning.diff
repo.or.cz automatic notification. Contact project admin crma...@gmail.com
if you want to unsubscribe, or site admin ad...@repo.or.cz if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
