gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 04:20:27 +01:00
Code Issues Projects Releases Wiki Activity

debian: Update with version 0.95.8-1~exp2 packaging.

Browse Source
This commit is contained in:
Doug Torrance
2017-07-08 09:23:09 -04:00
committed by Carlos R. Mafra
parent ff865c31f0
commit ee36395ddf
19 changed files with 98 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
debian/README.Debian vendored
View File

@@ -64,57 +64,6 @@ Other sources for documentation
As a sidenote, I can't package these files with wmaker because they
don't have a copyright statement that permits redistribution.
IF YOU ARE UPGRADING FROM 0.6.3 or earlier
------------------------------------------
* The directory name has changed form gnustep to GNUstep
* The format of the style files and Window Maker file has
changed.
IF YOU ARE UPGRADING FROM 0.14.1 or earlier (but newer than 0.6.3)
------------------------------------------------------------------
* The Fiend has been renamed to Clip (in order to avoid hurting
certain people's feelings... does that ring a bell or
what?!?). Look up "Fiend" in the dictionary... therefore, every
keyword on Defaults/WindowMaker that says "Fiend" has to be
replaced by "Clip". The installation package tries to fix this
globally, i.e, both in the system wide files and the user's files.
* The ~/GNUstep/Library/WindowMaker/Style directory is no longer
called that, but "Styles" instead. Update accordingly. The wrapper
script tries to be smart about this...
IF YOU ARE UPGRADING FROM 0.15.0 or earlier
-------------------------------------------
* WindowPlaceOrigin syntax changed. The old was:
WindowPlaceOrigin = "64, 64"
The new one is:
WindowPlaceOrigin = (64, 64)
The installation package also fixes this.
IF YOU ARE UPGRADING FROM 0.17.3 or earlier
-------------------------------------------
* Please note there's a new Icons directory under ~/GNUstep/Library,
and a new key IconPath. Read the section on paths.
IF YOU ARE UPGRADING FROM 0.17.5 or earlier
-------------------------------------------
* Pandora's Box has been opened: Beware that some features of recent
releases may not be compatible with those of 0.17.5; PLEASE read
the NEWS file and the ChangeLog. If you don't have problems
upgrading, consider it a gift from the gods. PLEASE NOTE: WPrefs
is a work in progress. SAVE YOUR CONFIGURATION. READ THE READMEs.
* Please note that WPrefs' Menu Guru REQUIRES a menu in "Property
List" format to work properly. It's very likely that you have an
old format menu. There's a script called wm-oldmenu2new alongside
this file that converts your menu to the new format. It's a hack,
it won't be installed anywhere else.
Debian specific notes
---------------------

64
debian/changelog vendored
View File

@@ -1,3 +1,67 @@
wmaker (0.95.8-1~exp2) experimental; urgency=medium
[ Doug Torrance ]
* debian/debianfiles/Themes/Debian.style
- Rename from just "Debian" for consistency with other Window
Maker themes.
* debian/debianfiles/upgrade-windowmaker-defaults
- Delete archaic script. It was intended to help users upgrade
Window Maker 15+ years ago when the configuration file syntax
was not stable. No longer necessary.
* debian/libwings3.symbols
- Remove MISSING comment lines.
* debian/libwings-dev.examples
- New file; install WINGs examples.
* debian/libwmaker-dev.install
- Install libwmaker pkg-config file.
* debian/patches/50_def_config_paths.diff
- Remove unnecessary patch. It added /etc/GNUstep/Defaults to
the DEF_CONFIG_PATHS macro, but the files needed in the paths
referenced in this macro (in particular, menu, autostart, and
exitscript) will not be located there.
* debian/patches/53_Debian_WMState.diff
- Update patch. The path to WPrefs is already set correctly
during build; we do not need to set it explicitly.
* debian/README.Debian
- Remove notes about upgrading from very old (15+ years ago)
versions of Window Maker.
* debian/watch
- Bump to uscan v4 and simplify using new strings.
* debian/wmaker.dirs
- Remove unnecessary file
* debian/wmaker-common.dirs
- Remove redundant lines.
* debian/wmaker-common.docs
- Do not specify installation of debian/copyright;
dh_installdocs already installs it by default.
* debian/wmaker-common.{docs,install}
- Move installation of various README files from dh_install
to dh_installdocs.
* debian/wmaker-common.install
- Simplify by giving directories instead of individual files
where possible.
* debian/wmaker-common.links
- Remove unnecessary file. It created a link which was a
workaround for a bug fixed in the latest upstream release.
* debian/wmaker-common.maintscript
- Sort with wrap-and-sort.
* debian/rules
- New override_dh_installdocs target; contains code renaming
README files from override_dh_install target.
[ Andreas Metzler ]
* Drop Rodolfo García Peñas from uploaders. - Thanks for your work!
Closes: #866854
* 10_util-fix-parsing-of-XDG-menus-with-multiple-groups.patch from upstream
GIT next: Fix wmmenugen parsing of XDG menu files with more than one
group.
[ Doug Torrance / Andreas Metzler ]
* Add dependency on wmaker-common (>= ${source:Version}) to libwutil5 and
libwings3 to make it possible to use these libraries without wmaker.
-- Andreas Metzler <ametzler@debian.org> Sat, 08 Jul 2017 11:43:39 +0200
wmaker (0.95.8-1~exp1) experimental; urgency=medium
* New upstream release.

9
debian/control vendored
View File

@@ -2,8 +2,7 @@ Source: wmaker
Section: x11
Priority: optional
Maintainer: Debian Window Maker Team <pkg-wmaker-devel@lists.alioth.debian.org>
Uploaders: Rodolfo García Peñas (kix) <kix@debian.org>,
Andreas Metzler <ametzler@debian.org>,
Uploaders: Andreas Metzler <ametzler@debian.org>,
Doug Torrance <dtorrance@piedmont.edu>
Standards-Version: 3.9.7
Build-Depends: automake (>= 1:1.12),
@@ -146,7 +145,8 @@ Package: libwutil5
Architecture: any
Multi-Arch: same
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
wmaker-common (>= ${source:Version})
Description: Window Maker's own widget set - utility library
WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
look and feel. Its API is inspired in OpenSTEP and its
@@ -161,7 +161,8 @@ Package: libwings3
Architecture: any
Multi-Arch: same
Section: libs
Depends: ${misc:Depends}, ${shlibs:Depends}
Depends: ${misc:Depends}, ${shlibs:Depends},
wmaker-common (>= ${source:Version})
Description: Window Maker's own widget set - runtime library
WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
look and feel. Its API is inspired in OpenSTEP and its

0
debian/debianfiles/Themes/Debian → debian/debianfiles/Themes/Debian.style vendored
View File

153
debian/debianfiles/upgrade-windowmaker-defaults vendored
View File

@@ -1,153 +0,0 @@
#! /bin/sh
# (c) 1998 Marcelo Magallon <mmagallo@debian.org>
# this script is distributed under the terms and conditions of the GPL.
#
# TODO:
#
# * Fix that ugly hack with fix*
# Is there something in the shell like Perl's hashes? It could be nice to
# do something like "foreach $var (keys %fixes)" to associate fixes with
# file names so I don't have to track things all over the place
#
# * Fix also the code that iterates over user directories to include system
# directories in one run
#
# upgrade-windowmaker-defaults (0.3)
#
# * Handles upgrade to Window Maker 0.19.0
# Logo.Clip -> Tile.Clip (crashing)
#
# upgrade-windowmaker-defaults (0.2)
#
# * Handles keyname changes between 0.16.1 and 0.17.2
#
# Tue Jul 21 08:05:00 CST 1998
#
# upgrade-windowmaker-defaults (0.1)
#
# * Initial release
# * Handles WindowPlaceOrigin syntax change
# * Handles name change Fiend -> Clip
#
# Sat Jun 13 16:18:36 CST 1998
# Fixes (these are not-optional changes)
# this one changes WindowPlaceOrigin = "..." to WindowPlaceOrigin = (...)
fix1='s/\(.*WindowPlaceOrigin = \)"\(.*\)";/\1(\2);/'
# and this one substitutes Fiend with Clip
fix2='s/\(.*\)Fiend\(.*\)=/\1Clip\2=/'
# this one applies to WMState
fix3='s/\( *\)Fiend\( *\)=/\1Clip\2=/'
fix4='s/\(.*\)Logo\.\(WMFiend\|WMClip\)\(.*\)=/\1Tile.WMClip\3=/'
# this one applies to Window Maker
fix5='s/\(.*\)NoSound\(.*\)=/\1DisableSound\2=/'
fix6='s/\(.*\)NoAutoWarp\(.*\)=/\1DontLinkWorspaces\2=/'
# this one is for WMWindowAttributes
# try to screen system accounts in the /etc/passwd file. If somebody
# has a better method for doing this, I'm open to suggestions. Please
# note that Debian Policy states accounts 0-99 are reserved for the
# Project, and 100 onwards *could* be used by the local sysadmin, but
# the default is 1000 and up
users='^[[:alnum:]]*:[[:alnum:]]*:[[:digit:]]\{4,\}:'
ask_n ()
{
echo -n $*'? [yN] '
read yn
test -n "$yn" || yn=n
case "$yn" in
[yY]*)
return 1
;;
*)
return 0
;;
esac
}
apply_fix ()
{
file_to_fix=$1; shift
if [ -e $file_to_fix ] ; then
echo -n "Fixing $file_to_fix... "
while [ $# -gt 0 ] ; do
sed -e "$1" $file_to_fix > $tempfile
cat $tempfile > $file_to_fix
shift
done
echo done.
fi
}
ask_permission ()
{
cat <<EOF
I can try to fix certain configuration parameters that have changed
between previous versions of Window Maker and this one, namely:
* WindowPlaceOrigin syntax change from "..." to (...)
* Name change of Fiend to Clip
* WMWindowAttributes: Logo.Clip -> Tile.Clip (crashing)
NOT fixing this could prevent Window Maker from starting. Please read
/usr/doc/wmaker/NEWS.gz and /usr/doc/wmaker/changelog.gz
I will fix *both* the system defaults and each user's files.
EOF
if ! ask_n "Do you want to proceed with the changes" ; then
return 0
else
return 1
fi
}
set -e
gs_dir=GNUstep
[ $GNUSTEP_USER_ROOT ] && gs_dir=$GNUSTEP_USER_ROOT
gs_defaults=$gs_dir/Defaults
gs_system_defaults=/etc/GNUstep/Defaults
if [ "$1" = "--non-interactive" ] || ask_permission ; then
tempfile=`tempfile`
# fix users' files
for dir in `cut -d : -f 6 /etc/passwd | sort -u` ; do
apply_fix $dir/$gs_defaults/WindowMaker "$fix1" "$fix2" "$fix5" "$fix6"
apply_fix $dir/$gs_defaults/WMState "$fix3"
apply_fix $dir/$gs_defaults/WMWindowAttributes "$fix4"
done
# fix system files
apply_fix $gs_system_defaults/WindowMaker "$fix1" "$fix2" "$fix5" "$fix6"
apply_fix $gs_system_defaults/WMState "$fix3"
apply_fix $gs_system_defaults/WMWindowAttributes "$fix4"
rm $tempfile
cat <<EOF
Done fixing things. If you want to run this script again you can do so by
typing:
$ $0
EOF
else
cat <<EOF
Ok, leaving things as they are now... you can run this script again using:
$ $0
EOF
fi
cat <<EOF
Press [ENTER] to continue...
EOF
read dummy
exit 0

2
debian/libwings-dev.examples vendored Normal file
View File

@@ -0,0 +1,2 @@
WINGs/Examples/*.c
WINGs/Examples/README

17
debian/libwings3.symbols vendored
View File

@@ -82,7 +82,6 @@ libWINGs.so.3 libwings3 #MINVER#
WMDefaultSystemFont@Base 0.95.0
WMDeleteDragHandler@Base 0.95.0
WMDeleteEventHandler@Base 0.95.0
#MISSING: 0.95.5-1# WMDeleteSelectionCallback@Base 0.95.0
WMDeleteSelectionHandler@Base 0.95.0
WMDeleteTextFieldRange@Base 0.95.0
WMDestroyAlertPanel@Base 0.95.0
@@ -540,7 +539,6 @@ libWINGs.so.3 libwings3 #MINVER#
W_DragSourceStartTimer@Base 0.95.0
W_DragSourceStateHandler@Base 0.95.0
W_DragSourceStopTimer@Base 0.95.0
#MISSING: 0.95.3-1# W_DraggingInfo@Base 0.95.0
W_DrawRelief@Base 0.95.0
W_DrawReliefWithGC@Base 0.95.0
W_FocusIC@Base 0.95.0
@@ -575,7 +573,6 @@ libWINGs.so.3 libwings3 #MINVER#
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
W_UnFocusIC@Base 0.95.0
W_UnmapSubviews@Base 0.95.0
@@ -585,7 +582,6 @@ libWINGs.so.3 libwings3 #MINVER#
W_setconf_doubleClickDelay@Base 0.95.5
_BrowserViewDelegate@Base 0.95.0
_ColorWellViewDelegate@Base 0.95.0
#MISSING: 0.95.6-1# _ListViewDelegate@Base 0.95.0
_ProgressIndicatorDelegate@Base 0.95.0
_RulerViewDelegate@Base 0.95.0
_ScrollViewViewDelegate@Base 0.95.0
@@ -595,23 +591,10 @@ libWINGs.so.3 libwings3 #MINVER#
_TextViewDelegate@Base 0.95.0
_WindowViewDelegate@Base 0.95.0
colorListMenuItem@Base 0.95.0
#MISSING: 0.95.5-1# convertCPColor@Base 0.95.0
customPaletteMenuItem@Base 0.95.0
#MISSING: 0.95.5-1# generateNewFilename@Base 0.95.0
#MISSING: 0.95.5-1# getNextRequestedDataType@Base 0.95.0
#MISSING: 0.95.5-1# getShift@Base 0.95.0
#MISSING: 0.95.5-1# getStream@Base 0.95.0
#MISSING: 0.95.5-1# getStreamObjects@Base 0.95.0
#MISSING: 0.95.5-1# makeMenuPixmap@Base 0.95.0
#MISSING: 0.95.5-1# requestDropData@Base 0.95.0
#MISSING: 0.95.5-1# requestDropDataInSelection@Base 0.95.0
#MISSING: 0.95.5-1# requestHandler@Base 0.95.0
rgbCharToInt@Base 0.95.6
rgbColors@Base 0.95.0
rgbIntToChar@Base 0.95.6
#MISSING: 0.95.5-1# sourceOperationList@Base 0.95.0
#MISSING: 0.95.5-1# storeRequiredTypeList@Base 0.95.0
#MISSING: 0.95.5-1# ulongToRColor@Base 0.95.0
wmkpoint@Base 0.95.0
wmkrect@Base 0.95.0
wmksize@Base 0.95.0

1
debian/libwmaker-dev.install vendored
View File

@@ -1,3 +1,4 @@
usr/include/WMaker.h
usr/lib/*/libWMaker.a
usr/lib/*/libWMaker.so
usr/lib/*/pkgconfig/wmlib.pc

16
debian/patches/50_def_config_paths.diff vendored
View File

@@ -1,16 +0,0 @@
Description: This patch changes the default config paths
Author: Andreas Metzler <ametzler@debian.org>
Last-Update: 2010-08-07
Index: wmaker-crm/src/wconfig.h.in
===================================================================
--- 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 */
-#define DEF_CONFIG_PATHS "~/GNUstep/Library/WindowMaker:"PKGDATADIR
+#define DEF_CONFIG_PATHS "~/GNUstep/Library/WindowMaker:/etc/GNUstep/Defaults:"PKGDATADIR
#define DEF_MENU_FILE "menu"
/* name of the script to execute at startup */

21
debian/patches/53_Debian_WMState.diff vendored
View File

@@ -1,19 +1,10 @@
Description: XTerm and WMPrefs debian configuration. Based on Marcelo E. Magallon <mmagallo@debian.org> diff patch.
Description: XTerm debian configuration.
Based on Marcelo E. Magallon <mmagallo@debian.org> diff patch.
Author: Rodolfo García Peñas (kix) <kix@kix.es>
Last-Update: 2012-01-09
Index: wmaker-crm/WindowMaker/Defaults/WMState.in
===================================================================
--- wmaker-crm.orig/WindowMaker/Defaults/WMState.in
+++ wmaker-crm/WindowMaker/Defaults/WMState.in
@@ -2,7 +2,7 @@
Dock = {
Applications = (
{
- Command = "#wprefs#";
+ Command = "/usr/bin/WPrefs";
Name = Logo.WMDock;
AutoLaunch = No;
Forced = No;
Last-Update: 2017-03-11
--- a/WindowMaker/Defaults/WMState.in
+++ b/WindowMaker/Defaults/WMState.in
@@ -10,8 +10,8 @@
Lock = Yes;
},

1
debian/patches/series vendored
View File

@@ -1,3 +1,2 @@
50_def_config_paths.diff
53_Debian_WMState.diff
54_Debian_wmmacros.diff

13
debian/rules vendored
View File

@@ -39,17 +39,20 @@ override_dh_auto_configure:
override_dh_installmenu:
dh_installmenu -a --noscripts
override_dh_install:
# Fix perms for /usr/share/WindowMaker/*sh before install them
chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/autostart.sh
chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/exitscript.sh
override_dh_installdocs:
# Readmes - Copy+rename before install
# We use the root of the temporal directory debian/tmp
cp po/README $(DEBIAN_TMP)/README.po
cp README.definable-cursor $(DEBIAN_TMP)/README.definable-cursor
cp WPrefs.app/README $(DEBIAN_TMP)/README.WPrefs
cp WPrefs.app/po/README $(DEBIAN_TMP)/README.WPrefs.po
dh_installdocs
override_dh_install:
# Fix perms for /usr/share/WindowMaker/*sh before install them
chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/autostart.sh
chmod +x $(DEBIAN_TMP)$(WMSHAREDIR)/exitscript.sh
# Now, change the #wmdatadir# string to $(WMSHAREDIR)
perl -pi -e 's:#wmdatadir#:$(WMSHAREDIR):' `find $(DEBIAN_TMP)/$(WMSHAREDIR) -name plmenu.*`

5
debian/watch vendored
View File

@@ -1,3 +1,2 @@
version=3
http://windowmaker.org/ \
(?:|.*/)WindowMaker(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
version=4
http://windowmaker.org/ (?:|.*/)WindowMaker@ANY_VERSION@@ARCHIVE_EXT@

5
debian/wmaker-common.dirs vendored
View File

@@ -1,7 +1,2 @@
etc/GNUstep/Defaults
etc/menu-methods
usr/bin
usr/sbin
usr/share/doc/wmaker
usr/share/doc/wmaker-common
usr/share/xsessions

5
debian/wmaker-common.docs vendored
View File

@@ -5,6 +5,9 @@ FAQ
NEWS
README
TODO
debian/copyright
debian/debianfiles/Themes/DebianLegacy.txt
debian/tmp/README.WPrefs
debian/tmp/README.WPrefs.po
debian/tmp/README.definable-cursor
debian/tmp/README.po
util/wm-oldmenu2new

35
debian/wmaker-common.install vendored
View File

@@ -1,8 +1,4 @@
README.WPrefs usr/share/doc/wmaker
README.WPrefs.po usr/share/doc/wmaker
README.definable-cursor usr/share/doc/wmaker
README.po usr/share/doc/wmaker
debian/debianfiles/Themes/Debian usr/share/WindowMaker/Themes
debian/debianfiles/Themes/Debian.style usr/share/WindowMaker/Themes
debian/debianfiles/Themes/DebianLegacy.style usr/share/WindowMaker/Themes
debian/debianfiles/Themes/DebianSwirl.jpg usr/share/WindowMaker/Backgrounds
debian/debianfiles/Themes/debian.tiff usr/share/WindowMaker/Backgrounds
@@ -10,36 +6,13 @@ debian/debianfiles/conf/WMRootMenu etc/GNUstep/Defaults
debian/debianfiles/conf/WMWindowAttributes etc/GNUstep/Defaults
debian/debianfiles/conf/WindowMaker etc/GNUstep/Defaults
debian/debianfiles/menu/wmappearance etc/menu-methods
debian/debianfiles/upgrade-windowmaker-defaults usr/sbin
debian/debianfiles/wmaker usr/bin
debian/debianfiles/wmaker-common.desktop usr/share/xsessions
etc/GNUstep/Defaults/WMGLOBAL
etc/GNUstep/Defaults/WMState
usr/share/WINGs/Images.tiff
usr/share/WINGs/Images.xpm
usr/share/WINGs/defaultIcon.tiff
usr/share/WINGs/defaultIcon.xpm
usr/share/WindowMaker/Backgrounds/BlueImage.jpeg
usr/share/WindowMaker/IconSets/Default.iconset
usr/share/WindowMaker/Icons/*.png
usr/share/WindowMaker/Icons/*.tiff
usr/share/WindowMaker/Icons/*.xpm
usr/share/WindowMaker/Icons/README
usr/share/WindowMaker/Pixmaps/*.png
usr/share/WindowMaker/Pixmaps/*.xpm
usr/share/WindowMaker/README
usr/share/WindowMaker/README.themes
usr/share/WindowMaker/Styles/*.style
usr/share/WindowMaker/Themes/*.style
usr/share/WindowMaker/autostart.sh
usr/share/WindowMaker/background.menu
usr/share/WindowMaker/exitscript.sh
usr/share/WindowMaker/menu
usr/share/WindowMaker/menu.*
usr/share/WindowMaker/plmenu
usr/share/WindowMaker/plmenu.*
usr/share/WindowMaker/wmmacros
usr/share/WINGs
usr/share/WindowMaker
usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff
usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.xpm
usr/share/lib/GNUstep/System/Applications/WPrefs.app/tiff/*.tiff
usr/share/lib/GNUstep/System/Applications/WPrefs.app/tiff
usr/share/locale/*/LC_MESSAGES/*.mo

1
debian/wmaker-common.links vendored
View File

@@ -1 +0,0 @@
etc/GNUstep/Defaults usr/share/WindowMaker/Defaults

4
debian/wmaker-common.maintscript vendored
View File

@@ -1,5 +1,5 @@
mv_conffile /etc/X11/WindowMaker/background.menu /usr/share/WindowMaker/background.menu 0.95.7-5~
mv_conffile /etc/X11/WindowMaker/wmmacros /usr/share/WindowMaker/wmmacros 0.95.7-5~
rm_conffile /etc/X11/WindowMaker/appearance.menu 0.95.7-5~
rm_conffile /etc/X11/WindowMaker/menu.posthook 0.95.7-5~
rm_conffile /etc/X11/WindowMaker/menu.prehook 0.95.7-5~
mv_conffile /etc/X11/WindowMaker/background.menu /usr/share/WindowMaker/background.menu 0.95.7-5~
mv_conffile /etc/X11/WindowMaker/wmmacros /usr/share/WindowMaker/wmmacros 0.95.7-5~

2
debian/wmaker.dirs vendored
View File

@@ -1,2 +0,0 @@
usr/lib/GNUstep/System/Applications/WPrefs.app
usr/lib/WindowMaker