> Except that it doesn't apply in the current #next branch...
OK, this applies -- the wmiv patch this morning broke it.
> Thanks for the patch. I guess it makes sense to apply it to the
> repo because it has the potential to avoid many wasted hours for
> some people who want to do what you did already.
BTW, I'm still not sure if this should go in. I think the debian/ folder
is for proper Debian(tm), and I'm not entirely sure what the differences
are for Ubuntu. Maybe someone with more .deb packaging experience can
chime in.
Regards,
Johann
>From 8df52c76236740a6475dd171ebd3286eb2ce7a43 Mon Sep 17 00:00:00 2001
From: Johann Haarhoff <joh...@haarhoff.org.za>
Date: Mon, 8 Jun 2015 17:28:08 +0200
Subject: [PATCH] Build on Ubuntu 14.04
---
debian/libwraster5.symbols | 119 +++++++++++++++++++-------------------
debian/patches/51_wmaker_man.diff | 6 +-
debian/rules | 4 +-
debian/wmaker-common.docs | 1 -
debian/wmaker-common.manpages | 4 +-
debian/wmaker.install | 54 ++++++++---------
debian/wmaker.manpages | 20 +++----
7 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/debian/libwraster5.symbols b/debian/libwraster5.symbols
index 22bd776..a538213 100644
--- a/debian/libwraster5.symbols
+++ b/debian/libwraster5.symbols
@@ -1,60 +1,61 @@
libwraster.so.5 libwraster5 #MINVER#
- LIBWRASTER3@LIBWRASTER3 0.95.0
- RBevelImage@LIBWRASTER3 0.95.0
- RBlurImage@LIBWRASTER3 0.95.0
- RClearImage@LIBWRASTER3 0.95.0
- RCloneImage@LIBWRASTER3 0.95.0
- RCombineArea@LIBWRASTER3 0.95.0
- RCombineAreaWithOpaqueness@LIBWRASTER3 0.95.0
- RCombineImageWithColor@LIBWRASTER3 0.95.0
- RCombineImages@LIBWRASTER3 0.95.0
- RCombineImagesWithOpaqueness@LIBWRASTER3 0.95.0
- RConvertImage@LIBWRASTER3 0.95.0
- RConvertImageMask@LIBWRASTER3 0.95.0
- RCopyArea@LIBWRASTER3 0.95.0
- RCreateContext@LIBWRASTER3 0.95.0
- RCreateImage@LIBWRASTER3 0.95.0
- RCreateImageFromDrawable@LIBWRASTER3 0.95.0
- RCreateImageFromXImage@LIBWRASTER3 0.95.0
- RCreateXImage@LIBWRASTER3 0.95.0
- RDestroyContext@LIBWRASTER3 0.95.6
- RDestroyXImage@LIBWRASTER3 0.95.0
- RDrawLine@LIBWRASTER3 0.95.0
- RDrawLines@LIBWRASTER3 0.95.0
- RDrawSegments@LIBWRASTER3 0.95.0
- RErrorCode@LIBWRASTER3 0.95.0
- RFillImage@LIBWRASTER3 0.95.0
- RFlipImage@LIBWRASTER3 0.95.6
- RGetClosestXColor@LIBWRASTER3 0.95.0
- RGetImageFileFormat@LIBWRASTER3 0.95.0
- RGetImageFromXPMData@LIBWRASTER3 0.95.0
- RGetPixel@LIBWRASTER3 0.95.0
- RGetSubImage@LIBWRASTER3 0.95.0
- RGetXImage@LIBWRASTER3 0.95.0
- RHSVtoRGB@LIBWRASTER3 0.95.0
- RLightImage@LIBWRASTER3 0.95.0
- RLoadImage@LIBWRASTER3 0.95.0
- RMakeCenteredImage@LIBWRASTER3 0.95.0
- RMakeTiledImage@LIBWRASTER3 0.95.0
- RMessageForError@LIBWRASTER3 0.95.0
- ROperateLine@LIBWRASTER3 0.95.0
- ROperateLines@LIBWRASTER3 0.95.0
- ROperatePixel@LIBWRASTER3 0.95.0
- ROperatePixels@LIBWRASTER3 0.95.0
- ROperateRectangle@LIBWRASTER3 0.95.6
- ROperateSegments@LIBWRASTER3 0.95.0
- RPutPixel@LIBWRASTER3 0.95.0
- RPutPixels@LIBWRASTER3 0.95.0
- RPutXImage@LIBWRASTER3 0.95.0
- RRGBtoHSV@LIBWRASTER3 0.95.0
- RReleaseImage@LIBWRASTER3 0.95.0
- RRenderGradient@LIBWRASTER3 0.95.0
- RRenderInterwovenGradient@LIBWRASTER3 0.95.0
- RRenderMultiGradient@LIBWRASTER3 0.95.0
- RRetainImage@LIBWRASTER3 0.95.0
- RRotateImage@LIBWRASTER3 0.95.0
- RSaveImage@LIBWRASTER3 0.95.0
- RScaleImage@LIBWRASTER3 0.95.0
- RShutdown@LIBWRASTER3 0.95.6
- RSmoothScaleImage@LIBWRASTER3 0.95.0
- RSupportedFileFormats@LIBWRASTER3 0.95.0
+ LIBWRASTER3@LIBWRASTER3 0.95.6-1.1
+ RBevelImage@LIBWRASTER3 0.95.6-1.1
+ RBlurImage@LIBWRASTER3 0.95.6-1.1
+ RClearImage@LIBWRASTER3 0.95.6-1.1
+ RCloneImage@LIBWRASTER3 0.95.6-1.1
+ RCombineAlpha@LIBWRASTER3 0.95.6-1.1
+ RCombineArea@LIBWRASTER3 0.95.6-1.1
+ RCombineAreaWithOpaqueness@LIBWRASTER3 0.95.6-1.1
+ RCombineImageWithColor@LIBWRASTER3 0.95.6-1.1
+ RCombineImages@LIBWRASTER3 0.95.6-1.1
+ RCombineImagesWithOpaqueness@LIBWRASTER3 0.95.6-1.1
+ RConvertImage@LIBWRASTER3 0.95.6-1.1
+ RConvertImageMask@LIBWRASTER3 0.95.6-1.1
+ RCopyArea@LIBWRASTER3 0.95.6-1.1
+ RCreateContext@LIBWRASTER3 0.95.6-1.1
+ RCreateImage@LIBWRASTER3 0.95.6-1.1
+ RCreateImageFromDrawable@LIBWRASTER3 0.95.6-1.1
+ RCreateImageFromXImage@LIBWRASTER3 0.95.6-1.1
+ RCreateXImage@LIBWRASTER3 0.95.6-1.1
+ RDestroyContext@LIBWRASTER3 0.95.6-1.1
+ RDestroyXImage@LIBWRASTER3 0.95.6-1.1
+ RDrawLine@LIBWRASTER3 0.95.6-1.1
+ RDrawLines@LIBWRASTER3 0.95.6-1.1
+ RDrawSegments@LIBWRASTER3 0.95.6-1.1
+ RErrorCode@LIBWRASTER3 0.95.6-1.1
+ RFillImage@LIBWRASTER3 0.95.6-1.1
+ RFlipImage@LIBWRASTER3 0.95.6-1.1
+ RGetClosestXColor@LIBWRASTER3 0.95.6-1.1
+ RGetImageFileFormat@LIBWRASTER3 0.95.6-1.1
+ RGetImageFromXPMData@LIBWRASTER3 0.95.6-1.1
+ RGetPixel@LIBWRASTER3 0.95.6-1.1
+ RGetSubImage@LIBWRASTER3 0.95.6-1.1
+ RGetXImage@LIBWRASTER3 0.95.6-1.1
+ RHSVtoRGB@LIBWRASTER3 0.95.6-1.1
+ RLightImage@LIBWRASTER3 0.95.6-1.1
+ RLoadImage@LIBWRASTER3 0.95.6-1.1
+ RMakeCenteredImage@LIBWRASTER3 0.95.6-1.1
+ RMakeTiledImage@LIBWRASTER3 0.95.6-1.1
+ RMessageForError@LIBWRASTER3 0.95.6-1.1
+ ROperateLine@LIBWRASTER3 0.95.6-1.1
+ ROperateLines@LIBWRASTER3 0.95.6-1.1
+ ROperatePixel@LIBWRASTER3 0.95.6-1.1
+ ROperatePixels@LIBWRASTER3 0.95.6-1.1
+ ROperateRectangle@LIBWRASTER3 0.95.6-1.1
+ ROperateSegments@LIBWRASTER3 0.95.6-1.1
+ RPutPixel@LIBWRASTER3 0.95.6-1.1
+ RPutPixels@LIBWRASTER3 0.95.6-1.1
+ RPutXImage@LIBWRASTER3 0.95.6-1.1
+ RRGBtoHSV@LIBWRASTER3 0.95.6-1.1
+ RReleaseImage@LIBWRASTER3 0.95.6-1.1
+ RRenderGradient@LIBWRASTER3 0.95.6-1.1
+ RRenderInterwovenGradient@LIBWRASTER3 0.95.6-1.1
+ RRenderMultiGradient@LIBWRASTER3 0.95.6-1.1
+ RRetainImage@LIBWRASTER3 0.95.6-1.1
+ RRotateImage@LIBWRASTER3 0.95.6-1.1
+ RSaveImage@LIBWRASTER3 0.95.6-1.1
+ RScaleImage@LIBWRASTER3 0.95.6-1.1
+ RShutdown@LIBWRASTER3 0.95.6-1.1
+ RSmoothScaleImage@LIBWRASTER3 0.95.6-1.1
+ RSupportedFileFormats@LIBWRASTER3 0.95.6-1.1
diff --git a/debian/patches/51_wmaker_man.diff b/debian/patches/51_wmaker_man.diff
index 1d4a956..64b0dec 100644
--- a/debian/patches/51_wmaker_man.diff
+++ b/debian/patches/51_wmaker_man.diff
@@ -1,10 +1,10 @@
Description: This patch includes the debian paths
Author: Rodolfo GarcÃa Peñas (kix) <k...@kix.es>
Last-Update: 2011-08-16
-Index: WindowMaker-0.95.6/doc/wmaker.1x
+Index: WindowMaker-0.95.6/doc/wmaker.1
===================================================================
---- WindowMaker-0.95.6.orig/doc/wmaker.1x
-+++ WindowMaker-0.95.6/doc/wmaker.1x
+--- WindowMaker-0.95.6.orig/doc/wmaker.1
++++ WindowMaker-0.95.6/doc/wmaker.1
@@ -9,6 +9,9 @@ wmaker \- X11 window manager with a NEXT
Window Maker is a X11 window manager with a NEXTSTEP look. It tries to
emulate NeXT's look as much as possible, but it deviates from it as
diff --git a/debian/rules b/debian/rules
index 74dd692..8dfd436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
LINGUAS := $(patsubst po/%.po, %, $(wildcard po/*.po))
-WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-xinerama
+WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-randr --enable-pango --enable-xinerama
#not-enabled --enable-usermenu --disable-shape --disable-shm --enable-xrandr
#not-enabled --disable-xpm --disable-png --disable-jpeg --disable-gif --disable-tiff
@@ -31,7 +31,7 @@ COMMON_OPTIONS := --prefix=$(BASEDIR) \
--includedir=$(INCLUDEDIR) \
--sysconfdir=$(CONFDIR) \
--datadir=$(SHAREDIR) \
- --with-nlsdir=$(NLSDIR) \
+ --with-localedir=$(NLSDIR) \
--with-pixmapdir=$(PIXMAPDIR) \
--with-gnustepdir=$(GNUSTEPDIR)
diff --git a/debian/wmaker-common.docs b/debian/wmaker-common.docs
index 59ad325..b8a02f7 100644
--- a/debian/wmaker-common.docs
+++ b/debian/wmaker-common.docs
@@ -5,7 +5,6 @@ NEWS
README
TODO
FAQ
-FAQ.I18N
debian/debianfiles/Theme/Debian.theme.txt
debian/copyright
# Place wm-oldmenu2new under a more appropiate directory
diff --git a/debian/wmaker-common.manpages b/debian/wmaker-common.manpages
index d8350fb..a185795 100644
--- a/debian/wmaker-common.manpages
+++ b/debian/wmaker-common.manpages
@@ -1,3 +1,3 @@
doc/upgrade-windowmaker-defaults.8
-doc/wmaker.1x
-doc/WindowMaker.1x
+doc/wmaker.1
+doc/WindowMaker.1
diff --git a/debian/wmaker.install b/debian/wmaker.install
index 265bb4e..ba234d7 100644
--- a/debian/wmaker.install
+++ b/debian/wmaker.install
@@ -14,30 +14,30 @@ usr/bin/wmaker usr/lib/WindowMaker
usr/bin/convertfonts usr/lib/WindowMaker
usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs usr/lib/GNUstep/System/Applications/WPrefs.app
# Manpages - Locale specific
-usr/share/man/ru/man1/wxpaste.1x
-usr/share/man/ru/man1/geticonset.1x
-usr/share/man/ru/man1/seticons.1x
-usr/share/man/ru/man1/setstyle.1x
-usr/share/man/ru/man1/getstyle.1x
-usr/share/man/ru/man1/wdwrite.1x
-usr/share/man/ru/man1/wxcopy.1x
-usr/share/man/ru/man1/wmaker.1x
-usr/share/man/ru/man1/wmsetbg.1x
-usr/share/man/sk/man1/wxpaste.1x
-usr/share/man/sk/man1/geticonset.1x
-usr/share/man/sk/man1/seticons.1x
-usr/share/man/sk/man1/setstyle.1x
-usr/share/man/sk/man1/getstyle.1x
-usr/share/man/sk/man1/wdwrite.1x
-usr/share/man/sk/man1/wxcopy.1x
-usr/share/man/sk/man1/wmaker.1x
-usr/share/man/sk/man1/wmsetbg.1x
-usr/share/man/cs/man1/wxpaste.1x
-usr/share/man/cs/man1/geticonset.1x
-usr/share/man/cs/man1/seticons.1x
-usr/share/man/cs/man1/setstyle.1x
-usr/share/man/cs/man1/getstyle.1x
-usr/share/man/cs/man1/wdwrite.1x
-usr/share/man/cs/man1/wxcopy.1x
-usr/share/man/cs/man1/wmaker.1x
-usr/share/man/cs/man1/wmsetbg.1x
+usr/share/man/ru/man1/wxpaste.1
+usr/share/man/ru/man1/geticonset.1
+usr/share/man/ru/man1/seticons.1
+usr/share/man/ru/man1/setstyle.1
+usr/share/man/ru/man1/getstyle.1
+usr/share/man/ru/man1/wdwrite.1
+usr/share/man/ru/man1/wxcopy.1
+usr/share/man/ru/man1/wmaker.1
+usr/share/man/ru/man1/wmsetbg.1
+usr/share/man/sk/man1/wxpaste.1
+usr/share/man/sk/man1/geticonset.1
+usr/share/man/sk/man1/seticons.1
+usr/share/man/sk/man1/setstyle.1
+usr/share/man/sk/man1/getstyle.1
+usr/share/man/sk/man1/wdwrite.1
+usr/share/man/sk/man1/wxcopy.1
+usr/share/man/sk/man1/wmaker.1
+usr/share/man/sk/man1/wmsetbg.1
+usr/share/man/cs/man1/wxpaste.1
+usr/share/man/cs/man1/geticonset.1
+usr/share/man/cs/man1/seticons.1
+usr/share/man/cs/man1/setstyle.1
+usr/share/man/cs/man1/getstyle.1
+usr/share/man/cs/man1/wdwrite.1
+usr/share/man/cs/man1/wxcopy.1
+usr/share/man/cs/man1/wmaker.1
+usr/share/man/cs/man1/wmsetbg.1
diff --git a/debian/wmaker.manpages b/debian/wmaker.manpages
index ae73e30..1c93a1c 100644
--- a/debian/wmaker.manpages
+++ b/debian/wmaker.manpages
@@ -1,14 +1,14 @@
doc/wmgenmenu.1
doc/wdread.1
doc/wmmenugen.1
-doc/geticonset.1x
-doc/getstyle.1x
-doc/seticons.1x
-doc/setstyle.1x
-doc/wdwrite.1x
-doc/wmagnify.1x
-doc/wmsetbg.1x
-doc/WPrefs.1x
-doc/wxcopy.1x
-doc/wxpaste.1x
+doc/geticonset.1
+doc/getstyle.1
+doc/seticons.1
+doc/setstyle.1
+doc/wdwrite.1
+doc/wmagnify.1
+doc/wmsetbg.1
+doc/WPrefs.1
+doc/wxcopy.1
+doc/wxpaste.1
doc/wmiv.1
--
1.9.1
