[PATCH] Window Maker 0.95.7 Debian files
Rodolfo García Peñas (kix) <[email protected]>
| Newsgroups | gmane.compw.window-managers.windowmaker.devel |
|---|---|
| Message-ID | <[email protected]> |
Signed-off-by: Rodolfo García Peñas (kix) <[email protected]> --- debian/changelog | 24 +++++++ debian/copyright | 26 ------- debian/debianfiles/wmaker-common.desktop | 1 - debian/libwings3.symbols | 4 ++ debian/libwraster5.symbols | 120 +++++++++++++++---------------- debian/patches/50_def_config_paths.diff | 8 +-- debian/patches/51_wmaker_man.diff | 24 +++---- debian/patches/53_Debian_WMState.diff | 6 +- debian/patches/54_Debian_wmmacros.diff | 6 +- debian/patches/55_ungif_problem.diff | 10 +-- debian/wmaker-common.postrm | 2 +- debian/wmaker.postrm | 2 +- 12 files changed, 118 insertions(+), 115 deletions(-) diff --git a/debian/changelog b/debian/changelog index 308bbc6..b0e1129 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +wmaker (0.95.7-1) unstable; urgency=medium + + * New upstrem version 0.95.7. + * debian/changelog, removed debian files (lintian warning). + * Updated debian/libwings3.symbols. + * Updated libwraster5.symbols + * Changed the test for the update-menu command in these files to avoid + a lintian warning (command-with-path-in-maintainer-script): + * debian/wmaker.postrm + * debian/wmaker-common.postrm + * Removed the Encoding field in debian/debianfiles/wmaker-common.desktop + to avoid a lintian warning (desktop-entry-contains-encoding-key). + * Updated debian/rules to include pango support (--enable-pango). + * Updated all debian/patches only with quilt refresh. + * Updated some debian files because the manpages are moved from + section 1x to 1: + * debian/patches/51_wmaker_man.diff + * debian/wmaker-common.manpages + * debian/wmaker.install + * debian/wmaker.manpages + * Removed upstream file FAQ.I18N in debian/wmaker-common.docs. + + -- Rodolfo García Peñas (kix) <[email protected]> Thu, 13 Aug 2015 20:19:33 +0200 + wmaker (0.95.6-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/copyright b/debian/copyright index c442083..67b38e1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -51,32 +51,6 @@ License: LGPL-2 License version 2 can be found in the file `/usr/share/common-licenses/LGPL-2'. -Files: debian/* -Copyright: 1997, Neil A. Rubin <[email protected]> - 1997, Marcelo E. Magallon <[email protected]> - 2011, Rodolfo García Peñas (kix) <[email protected]> -License: GPL-2+ - This program is free software; you can redistribute it - and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. - . - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - . - You should have received a copy of the GNU General Public - License along with this package; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA - . - On Debian systems, the full text of the GNU General Public - License version 2 can be found in the file - `/usr/share/common-licenses/GPL-2'. - Files: WindowMaker/Icons/BitchX.tiff WindowMaker/Icons/defaultAppIcon.tiff WindowMaker/Icons/GNUterm.tiff WindowMaker/Icons/defaultterm.tiff WindowMaker/Icons/draw.tiff WindowMaker/Icons/linuxterm.tiff diff --git a/debian/debianfiles/wmaker-common.desktop b/debian/debianfiles/wmaker-common.desktop index 3d6c633..f0276fe 100644 --- a/debian/debianfiles/wmaker-common.desktop +++ b/debian/debianfiles/wmaker-common.desktop @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=Window Maker Comment=This session logs you into Window Maker Exec=/usr/bin/wmaker diff --git a/debian/libwings3.symbols b/debian/libwings3.symbols index 291a94c..9e72df6 100644 --- a/debian/libwings3.symbols +++ b/debian/libwings3.symbols @@ -118,6 +118,7 @@ libWINGs.so.3 libwings3 #MINVER# WMGetBrowserSelectedRowInColumn@Base 0.95.0 WMGetButtonEnabled@Base 0.95.0 WMGetButtonSelected@Base 0.95.0 + WMGetButtonText@Base 0.95.7 WMGetColorAlpha@Base 0.95.0 WMGetColorPanel@Base 0.95.0 WMGetColorPanelColor@Base 0.95.0 @@ -216,6 +217,7 @@ libWINGs.so.3 libwings3 #MINVER# WMGetViewScreenPosition@Base 0.95.0 WMGetViewSize@Base 0.95.0 WMGetWidgetBackgroundColor@Base 0.95.0 + WMGetWidgetBackgroundPixmap@Base 0.95.7 WMGrayColor@Base 0.95.0 WMGreenComponentOfColor@Base 0.95.0 WMGroupButtons@Base 0.95.0 @@ -465,6 +467,7 @@ libWINGs.so.3 libwings3 #MINVER# WMSetViewNextResponder@Base 0.95.0 WMSetViewNotifySizeChanges@Base 0.95.0 WMSetWidgetBackgroundColor@Base 0.95.0 + WMSetWidgetBackgroundPixmap@Base 0.95.7 WMSetWidgetDefaultBoldFont@Base 0.95.0 WMSetWidgetDefaultFont@Base 0.95.0 WMSetWindowAspectRatio@Base 0.95.0 @@ -570,6 +573,7 @@ libWINGs.so.3 libwings3 #MINVER# W_SetFocusOfTopLevel@Base 0.95.0 W_SetPreeditPositon@Base 0.95.0 W_SetViewBackgroundColor@Base 0.95.0 + W_SetViewBackgroundPixmap@Base 0.95.7 W_SetViewCursor@Base 0.95.0 #MISSING: 0.95.5-1# W_SetXdndAwareProperty@Base 0.95.0 W_TopLevelOfView@Base 0.95.0 diff --git a/debian/libwraster5.symbols b/debian/libwraster5.symbols index a538213..366428f 100644 --- a/debian/libwraster5.symbols +++ b/debian/libwraster5.symbols @@ -1,61 +1,61 @@ libwraster.so.5 libwraster5 #MINVER# - 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 + 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 diff --git a/debian/patches/50_def_config_paths.diff b/debian/patches/50_def_config_paths.diff index 3c6584f..075f044 100644 --- a/debian/patches/50_def_config_paths.diff +++ b/debian/patches/50_def_config_paths.diff @@ -1,11 +1,11 @@ Description: This patch changes the default config paths Author: Andreas Metzler <[email protected]> Last-Update: 2010-08-07 -Index: WindowMaker-0.95.6/src/wconfig.h.in +Index: wmaker-crm/src/wconfig.h.in =================================================================== ---- WindowMaker-0.95.6.orig/src/wconfig.h.in -+++ WindowMaker-0.95.6/src/wconfig.h.in -@@ -122,7 +122,7 @@ +--- wmaker-crm.orig/src/wconfig.h.in ++++ wmaker-crm/src/wconfig.h.in +@@ -116,7 +116,7 @@ */ /* list of paths to look for the config files, searched in order of appearance */ diff --git a/debian/patches/51_wmaker_man.diff b/debian/patches/51_wmaker_man.diff index 64b0dec..2cf91eb 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) <[email protected]> -Last-Update: 2011-08-16 +Last-Update: 2015-08-13 Index: WindowMaker-0.95.6/doc/wmaker.1 =================================================================== ---- WindowMaker-0.95.6.orig/doc/wmaker.1 -+++ WindowMaker-0.95.6/doc/wmaker.1 +--- wmaker-crm.orig/doc/wmaker.in ++++ wmaker-crm/doc/wmaker.in @@ -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 @@ -14,17 +14,17 @@ Index: WindowMaker-0.95.6/doc/wmaker.1 +Debian installation of Window Maker.\fP .SH "OPTIONS" .TP - .B \-display host:display.screen -@@ -78,7 +81,7 @@ Attribute Editor (right drag the applica - Attributes) instead of modifying this file directly. There are just a - few options not available using the Attributes Editor. + .BI \-display " host:display.screen" +@@ -68,7 +71,7 @@ for a list of visuals available in your + .PP + .SH FILES .TP --.B /usr/share/WindowMaker/Defaults/ +-.B ~/GNUstep/Defaults/WindowMaker +.B /etc/GNUstep/Defaults/ - All the above-mentioned files are READ from here if not found except - for WMState, which is COPIED from here. No matter where they are read - from, if it's necessary to write configuration changes back into this -@@ -106,6 +109,9 @@ and here, in that order. Unless, the ind + general Window Maker defaults. + .TP + .B ~/GNUstep/Defaults/WMState +@@ -113,6 +116,9 @@ and here, in that order. Unless, the ind .B ~/GNUstep/Library/WindowMaker/Pixmaps/ Window Maker looks for \fBpixmaps\fP here .TP diff --git a/debian/patches/53_Debian_WMState.diff b/debian/patches/53_Debian_WMState.diff index 03dc418..c7fd06a 100644 --- a/debian/patches/53_Debian_WMState.diff +++ b/debian/patches/53_Debian_WMState.diff @@ -1,10 +1,10 @@ Description: XTerm and WMPrefs debian configuration. Based on Marcelo E. Magallon <[email protected]> diff patch. Author: Rodolfo García Peñas (kix) <[email protected]> Last-Update: 2012-01-09 -Index: WindowMaker-0.95.6/WindowMaker/Defaults/WMState.in +Index: wmaker-crm/WindowMaker/Defaults/WMState.in =================================================================== ---- WindowMaker-0.95.6.orig/WindowMaker/Defaults/WMState.in -+++ WindowMaker-0.95.6/WindowMaker/Defaults/WMState.in +--- wmaker-crm.orig/WindowMaker/Defaults/WMState.in ++++ wmaker-crm/WindowMaker/Defaults/WMState.in @@ -2,7 +2,7 @@ Dock = { Applications = ( diff --git a/debian/patches/54_Debian_wmmacros.diff b/debian/patches/54_Debian_wmmacros.diff index 7eab3aa..6d03765 100644 --- a/debian/patches/54_Debian_wmmacros.diff +++ b/debian/patches/54_Debian_wmmacros.diff @@ -1,8 +1,10 @@ Description: Macros for user paths. Based on Marcelo E. Magallon <[email protected]> diff patch. Author: Rodolfo García Peñas (kix) <[email protected]> Last-Update: 2012-01-09 ---- a/WindowMaker/wmmacros -+++ b/WindowMaker/wmmacros +Index: wmaker-crm/WindowMaker/wmmacros +=================================================================== +--- wmaker-crm.orig/WindowMaker/wmmacros ++++ wmaker-crm/WindowMaker/wmmacros @@ -22,7 +22,7 @@ /* * SETSTYLE FILE - loads a style file diff --git a/debian/patches/55_ungif_problem.diff b/debian/patches/55_ungif_problem.diff index 2c59883..20e826d 100644 --- a/debian/patches/55_ungif_problem.diff +++ b/debian/patches/55_ungif_problem.diff @@ -1,11 +1,11 @@ Description: Remove include ungif library (will use gif library) Author: Rodolfo García Peñas (kix) <[email protected]> Last-Update: 2014-10-09 -Index: WindowMaker-0.95.6/m4/wm_imgfmt_check.m4 +Index: wmaker-crm/m4/wm_imgfmt_check.m4 =================================================================== ---- WindowMaker-0.95.6.orig/m4/wm_imgfmt_check.m4 -+++ WindowMaker-0.95.6/m4/wm_imgfmt_check.m4 -@@ -19,7 +19,7 @@ +--- wmaker-crm.orig/m4/wm_imgfmt_check.m4 ++++ wmaker-crm/m4/wm_imgfmt_check.m4 +@@ -20,7 +20,7 @@ # WM_IMGFMT_CHECK_GIF # ------------------- # @@ -14,7 +14,7 @@ Index: WindowMaker-0.95.6/m4/wm_imgfmt_check.m4 # The check depends on variable 'enable_gif' being either: # yes - detect, fail if not found # no - do not detect, disable support -@@ -37,7 +37,7 @@ AS_IF([test "x$enable_gif" = "xno"], +@@ -38,7 +38,7 @@ AS_IF([test "x$enable_gif" = "xno"], wm_save_LIBS="$LIBS" dnl dnl We check first if one of the known libraries is available diff --git a/debian/wmaker-common.postrm b/debian/wmaker-common.postrm index fb13fcd..9ca9c8e 100644 --- a/debian/wmaker-common.postrm +++ b/debian/wmaker-common.postrm @@ -12,7 +12,7 @@ case "$1" in done ;; purge) - if [ -x /usr/bin/update-menus ] ; then + if which update-menus >/dev/null 2>&1 ; then update-menus rm -f /etc/GNUstep/Defaults/menu.hook /etc/GNUstep/Defaults/appearance.menu fi diff --git a/debian/wmaker.postrm b/debian/wmaker.postrm index 562a527..b31f7f9 100644 --- a/debian/wmaker.postrm +++ b/debian/wmaker.postrm @@ -3,7 +3,7 @@ set -e case "$1" in remove) - if [ -x /usr/bin/update-menus ] ; then + if which update-menus >/dev/null 2>&1 ; then update-menus fi ;; -- 2.5.0 -- To unsubscribe, send mail to [email protected].