For those interested, the official Debian packaging repository is at:
https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
---
debian/changelog | 26 ++++++-
debian/control | 87 +++++++++++++++------
debian/copyright | 2 +-
debian/libwings-dev.install | 18 ++---
debian/libwings3.install | 2 +-
debian/libwraster-dev.install | 8 +-
debian/libwraster5.install | 2 +-
debian/libwutil5.install | 2 +-
debian/rules | 2 +-
debian/source/options | 2 +-
debian/watch | 3 +-
debian/wmaker-common.dirs | 4 +-
debian/wmaker-common.docs | 5 +-
debian/wmaker-common.install | 173 +++++++++---------------------------------
debian/wmaker-common.manpages | 2 +-
debian/wmaker.dirs | 2 +-
debian/wmaker.install | 51 ++++++-------
debian/wmaker.manpages | 10 +--
18 files changed, 180 insertions(+), 221 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f86eca2..5256019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-wmaker (0.95.7-1) unstable; urgency=medium
+wmaker (0.95.7-1) experimental; urgency=medium
[ Rodolfo García Peñas (kix) ]
- * New upstrem version 0.95.7.
+ * New upstream version 0.95.7.
* debian/changelog, removed debian files (lintian warning).
* Updated debian/libwings3.symbols.
* Updated libwraster5.symbols
@@ -30,7 +30,27 @@ wmaker (0.95.7-1) unstable; urgency=medium
* wmaker manpage was also moved from section 1x to 1. Fix pointer in
README.Debian and update-alternatives slave link.
- -- Rodolfo García Peñas (kix) <k...@debian.org> Thu, 13 Aug 2015 20:19:33
+0200
+ [ Doug Torrance ]
+ * Switch maintenance to Debian Window Maker Team with kix, Andreas, and
+ myself as uploaders.
+ * Tidy up packaging using wrap-and-sort.
+ * Remove Breaks/Replaces wmaker (<< 0.95.0+20111028-3); this version is no
+ longer in Debian.
+ * Switch Depends to wmaker-common (= ${source:Version}) so common files
+ are also updated on upgrade.
+ * Add Vcs-* fields to debian/control.
+ * Update Format field in debian/copyright.
+ * Update debian/watch from sepwatch project.
+ * Remove files from debian/source/options which are handled now by
+ dh-autoreconf. Add distros directory (present in upstream git but not
+ tarball) and doc files modified during build.
+ * Add multiarch support. In particular, add Multi-Arch fields to
+ debian/control, add wildcards for multiarch triplets to debian/*.install,
+ and remove --libdir from dh_auto_configure in debian/rules.
+ * Use wildcards for locales in debian/wmaker-common.install for
+ maintainability.
+
+ -- Andreas Metzler <ametz...@debian.org> Sun, 10 Jan 2016 11:38:11 +0100
wmaker (0.95.6-1.2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 8cc6772..761b178 100644
--- a/debian/control
+++ b/debian/control
@@ -1,20 +1,46 @@
Source: wmaker
Section: x11
Priority: optional
-Maintainer: Rodolfo García Peñas (kix) <k...@debian.org>
+Maintainer: Debian Window Maker Team <pkg-wmaker-de...@lists.alioth.debian.org>
+Uploaders: Rodolfo García Peñas (kix) <k...@debian.org>,
+ Andreas Metzler <ametz...@debian.org>,
+ Doug Torrance <dtorra...@piedmont.edu>
Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), automake (>= 1:1.12), gettext,
- libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff5-dev,
- libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev,
- libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils, libxmu-dev,
- libxrandr-dev, dctrl-tools, dh-autoreconf
+Build-Depends: automake (>= 1:1.12),
+ dctrl-tools,
+ debhelper (>= 9),
+ dh-autoreconf,
+ gettext,
+ libfontconfig1-dev,
+ libgif-dev,
+ libjpeg-dev,
+ libpng-dev,
+ libsm-dev,
+ libtiff5-dev,
+ libtool,
+ libx11-dev,
+ libxext-dev,
+ libxft-dev,
+ libxinerama-dev,
+ libxkbfile-dev,
+ libxmu-dev,
+ libxpm-dev,
+ libxrandr-dev,
+ libxrender-dev,
+ libxt-dev,
+ sharutils
Homepage: http://windowmaker.org/
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-wmaker/wmaker.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
Package: wmaker
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wmaker-common (>=
0.95.0+20111028-3)
+Multi-Arch: foreign
+Depends: wmaker-common (= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Provides: x-window-manager
-Suggests: wmaker-data, menu, x11-apps, x-terminal-emulator, desktop-base
+Suggests: desktop-base, menu, wmaker-data, x-terminal-emulator, x11-apps
Description: NeXTSTEP-like window manager for X
Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
very closely, and it is now an official GNU project. Window Maker (originally
@@ -25,10 +51,9 @@ Description: NeXTSTEP-like window manager for X
Package: wmaker-common
Architecture: all
+Multi-Arch: foreign
Depends: ${misc:Depends}
Suggests: wmaker
-Replaces: wmaker (<< 0.95.0+20111028-3)
-Breaks: wmaker (<< 0.95.0+20111028-3)
Description: Window Maker - Architecture independent files
Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
very closely, and it is now an official GNU project. Window Maker (originally
@@ -41,10 +66,18 @@ Description: Window Maker - Architecture independent files
Package: libwraster-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: libwraster5 (= ${binary:Version}), libc6-dev, libx11-dev,
- libxext-dev, libxpm-dev, libjpeg-dev, libpng-dev, libgif-dev,
- libtiff5-dev, ${misc:Depends}
+Depends: libc6-dev,
+ libgif-dev,
+ libjpeg-dev,
+ libpng-dev,
+ libtiff5-dev,
+ libwraster5 (= ${binary:Version}),
+ libx11-dev,
+ libxext-dev,
+ libxpm-dev,
+ ${misc:Depends}
Breaks: libwraster3-dev
Replaces: libwraster3-dev
Description: Static libraries and headers of Window Maker rasterizer
@@ -57,8 +90,9 @@ Description: Static libraries and headers of Window Maker
rasterizer
Package: libwraster5
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Shared libraries of Window Maker rasterizer
This library is used to manipulate images and convert them to
a format that can be displayed through the X window system.
@@ -66,10 +100,17 @@ Description: Shared libraries of Window Maker rasterizer
Package: libwings-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: libc6-dev, libx11-dev, libxext-dev, libwraster-dev, libxft-dev,
- libfontconfig1-dev, libwutil5 (= ${binary:Version}),
- libwings3 (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-dev,
+ libfontconfig1-dev,
+ libwings3 (= ${binary:Version}),
+ libwraster-dev,
+ libwutil5 (= ${binary:Version}),
+ libx11-dev,
+ libxext-dev,
+ libxft-dev,
+ ${misc:Depends}
Description: Window Maker's own widget set
WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
look and feel. Its API is inspired in OpenSTEP and its
@@ -80,8 +121,9 @@ Description: Window Maker's own widget set
Package: libwutil5
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
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
@@ -94,8 +136,9 @@ Description: Window Maker's own widget set - utility library
Package: libwings3
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
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
@@ -108,11 +151,11 @@ Description: Window Maker's own widget set - runtime
library
Package: wmaker-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Priority: extra
-Depends: libwraster5 (= ${binary:Version}) | libwings3 (= ${binary:Version}) |
- libwutil5 (= ${binary:Version}) | wmaker (= ${binary:Version}),
- ${misc:Depends}
+Depends: libwraster5 (= ${binary:Version}) | libwings3 (= ${binary:Version}) |
libwutil5 (= ${binary:Version}) | wmaker (= ${binary:Version}),
+ ${misc:Depends}
Description: Debugging symbols for WindowMaker packages
Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
very closely, and it is now an official GNU project. Window Maker is not
diff --git a/debian/copyright b/debian/copyright
index 67b38e1..bfa7413 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format:
http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: wmaker
Upstream-Contact: Window Maker developers mailing list
<wmaker-dev@lists.windowmaker.org>
Source: http://repo.or.cz/w/wmaker-crm.git
diff --git a/debian/libwings-dev.install b/debian/libwings-dev.install
index 62f0016..4e08a80 100644
--- a/debian/libwings-dev.install
+++ b/debian/libwings-dev.install
@@ -1,11 +1,11 @@
-usr/include/WINGs/WUtil.h
-usr/include/WINGs/WINGs.h
-usr/include/WINGs/WINGsP.h
-usr/lib/pkgconfig/WINGs.pc
-usr/lib/pkgconfig/WUtil.pc
-usr/lib/libWINGs.a
-usr/lib/libWUtil.a
-usr/lib/libWUtil.so
-usr/lib/libWINGs.so
usr/bin/get-wings-flags
usr/bin/get-wutil-flags
+usr/include/WINGs/WINGs.h
+usr/include/WINGs/WINGsP.h
+usr/include/WINGs/WUtil.h
+usr/lib/*/libWINGs.a
+usr/lib/*/libWINGs.so
+usr/lib/*/libWUtil.a
+usr/lib/*/libWUtil.so
+usr/lib/*/pkgconfig/WINGs.pc
+usr/lib/*/pkgconfig/WUtil.pc
diff --git a/debian/libwings3.install b/debian/libwings3.install
index 92da05d..e5c2769 100644
--- a/debian/libwings3.install
+++ b/debian/libwings3.install
@@ -1 +1 @@
-usr/lib/libWINGs.so.*
+usr/lib/*/libWINGs.so.*
diff --git a/debian/libwraster-dev.install b/debian/libwraster-dev.install
index c84342c..7661fa8 100644
--- a/debian/libwraster-dev.install
+++ b/debian/libwraster-dev.install
@@ -1,5 +1,5 @@
-usr/include/wraster.h
-usr/lib/pkgconfig/wrlib.pc
-usr/lib/libwraster.so
-usr/lib/libwraster.a
usr/bin/get-wraster-flags
+usr/include/wraster.h
+usr/lib/*/libwraster.a
+usr/lib/*/libwraster.so
+usr/lib/*/pkgconfig/wrlib.pc
diff --git a/debian/libwraster5.install b/debian/libwraster5.install
index 89c5086..87b76f1 100644
--- a/debian/libwraster5.install
+++ b/debian/libwraster5.install
@@ -1 +1 @@
-usr/lib/libwraster.so.*
+usr/lib/*/libwraster.so.*
diff --git a/debian/libwutil5.install b/debian/libwutil5.install
index 9c78a3f..6326586 100644
--- a/debian/libwutil5.install
+++ b/debian/libwutil5.install
@@ -1 +1 @@
-usr/lib/libWUtil.so.*
+usr/lib/*/libWUtil.so.*
diff --git a/debian/rules b/debian/rules
index 684800e..ee55594 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ COMMON_OPTIONS := --datadir=$(SHAREDIR) \
override_dh_auto_configure:
env LINGUAS="$(LINGUAS)" dh_auto_configure --verbose -- \
- $(COMMON_OPTIONS) $(WMAKER_OPTIONS) --libdir=/usr/lib
+ $(COMMON_OPTIONS) $(WMAKER_OPTIONS)
override_dh_installmenu:
dh_installmenu -a --noscripts
diff --git a/debian/source/options b/debian/source/options
index e9adc41..11a39c6 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
# Don't store changes on autogenerated files
-extend-diff-ignore =
"(^|/)(compile|config\.sub|config\.guess|Makefile|configure|Makefile\.in|aclocal.m4|config.h.in|depcomp|INSTALL|install-sh|ltmain.sh|missing||libtool.m4|lt~obsolete.m4|ltoptions.m4|ltsugar.m4|ltversion.m4|.Po|WMRootMenu)$"
+extend-diff-ignore = "(^|/)(distros\/.+|INSTALL-WMAKER|README.i18n)$"
diff --git a/debian/watch b/debian/watch
index e5c1d89..4a33bbb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
version=3
-http://windowmaker.org/pub/source/release/WindowMaker-([\d+|\.]+).tar.gz
+http://windowmaker.org/ \
+(?:|.*/)WindowMaker(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
diff --git a/debian/wmaker-common.dirs b/debian/wmaker-common.dirs
index 35d9727..e39b518 100644
--- a/debian/wmaker-common.dirs
+++ b/debian/wmaker-common.dirs
@@ -1,7 +1,7 @@
-etc/menu-methods
etc/GNUstep/Defaults
+etc/menu-methods
usr/bin
usr/sbin
usr/share/doc/wmaker
-usr/share/xsessions
usr/share/doc/wmaker-common
+usr/share/xsessions
diff --git a/debian/wmaker-common.docs b/debian/wmaker-common.docs
index b8a02f7..4c37d36 100644
--- a/debian/wmaker-common.docs
+++ b/debian/wmaker-common.docs
@@ -1,11 +1,10 @@
AUTHORS
BUGFORM
BUGS
+FAQ
NEWS
README
TODO
-FAQ
-debian/debianfiles/Theme/Debian.theme.txt
debian/copyright
-# Place wm-oldmenu2new under a more appropiate directory
+debian/debianfiles/Theme/Debian.theme.txt
util/wm-oldmenu2new
diff --git a/debian/wmaker-common.install b/debian/wmaker-common.install
index 9bc0d24..453ed6d 100644
--- a/debian/wmaker-common.install
+++ b/debian/wmaker-common.install
@@ -1,146 +1,43 @@
-usr/share/WindowMaker/autostart.sh
-usr/share/WindowMaker/exitscript.sh
-usr/share/locale/it/LC_MESSAGES/WPrefs.mo
-usr/share/locale/it/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/da/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/de/LC_MESSAGES/WPrefs.mo
-usr/share/locale/de/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/de/LC_MESSAGES/wmgenmenu.mo
-usr/share/locale/de/LC_MESSAGES/WINGs.mo
-usr/share/locale/ro/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/hy/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/bg/LC_MESSAGES/WPrefs.mo
-usr/share/locale/bg/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/bg/LC_MESSAGES/WINGs.mo
-usr/share/locale/nl/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ja/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ja/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/pt/LC_MESSAGES/WPrefs.mo
-usr/share/locale/pt/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ru/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ru/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/no/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
-usr/share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/be/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/sk/LC_MESSAGES/WPrefs.mo
-usr/share/locale/sk/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/sk/LC_MESSAGES/WINGs.mo
-usr/share/locale/ko/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ko/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/cs/LC_MESSAGES/WPrefs.mo
-usr/share/locale/cs/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/cs/LC_MESSAGES/WINGs.mo
-usr/share/locale/hr/LC_MESSAGES/WPrefs.mo
-usr/share/locale/hr/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/gl/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/hu/LC_MESSAGES/WPrefs.mo
-usr/share/locale/hu/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/fr/LC_MESSAGES/WPrefs.mo
-usr/share/locale/fr/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/fr/LC_MESSAGES/wmgenmenu.mo
-usr/share/locale/fr/LC_MESSAGES/WINGs.mo
-usr/share/locale/sv/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/el/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/fi/LC_MESSAGES/WPrefs.mo
-usr/share/locale/fi/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
-usr/share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/tr/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/es/LC_MESSAGES/WPrefs.mo
-usr/share/locale/es/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/es/LC_MESSAGES/wmgenmenu.mo
-usr/share/locale/ca/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ca/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ca/LC_MESSAGES/WINGs.mo
-usr/share/locale/pl/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/et/LC_MESSAGES/WPrefs.mo
-usr/share/locale/et/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ms/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/bs/LC_MESSAGES/WindowMaker.mo
-usr/share/WindowMaker/menu.pt
-usr/share/WindowMaker/plmenu.ko
-usr/share/WindowMaker/menu.sk
-usr/share/WindowMaker/plmenu.de
-usr/share/WindowMaker/plmenu.bg
-usr/share/WindowMaker/plmenu.pl
-usr/share/WindowMaker/menu.ru
+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/Theme/Debian
usr/share/WindowMaker/Themes
+debian/debianfiles/Theme/debian.tiff
usr/share/WindowMaker/Backgrounds
+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/WindowMaker/WMGLOBAL etc/GNUstep/Defaults
+etc/WindowMaker/WMState etc/GNUstep/Defaults
+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/plmenu
-usr/share/WindowMaker/menu.es
-usr/share/WindowMaker/wmmacros
-usr/share/WindowMaker/menu.hu
-usr/share/WindowMaker/menu.he
-usr/share/WindowMaker/menu.sl
-usr/share/WindowMaker/menu
-usr/share/WindowMaker/Backgrounds/BlueImage.jpeg
-usr/share/WindowMaker/menu.nl
-usr/share/WindowMaker/plmenu.ja
+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/menu.ro
-usr/share/WindowMaker/menu.bg
-usr/share/WindowMaker/menu.se
-usr/share/WindowMaker/background.menu
-usr/share/WindowMaker/menu.ca
-usr/share/WindowMaker/menu.hr
-usr/share/WindowMaker/menu.fr
-usr/share/WindowMaker/menu.cz
-usr/share/WindowMaker/menu.da
-usr/share/WindowMaker/menu.ko
-usr/share/WindowMaker/plmenu.sk
-usr/share/WindowMaker/plmenu.fi
-usr/share/WindowMaker/plmenu.it
-usr/share/WindowMaker/menu.ja
-usr/share/WindowMaker/menu.fi
usr/share/WindowMaker/Themes/*.style
-usr/share/WindowMaker/plmenu.da
-usr/share/WindowMaker/plmenu.ro
-usr/share/WindowMaker/README.themes
-usr/share/WindowMaker/menu.de
-usr/share/WindowMaker/plmenu.es
-usr/share/WindowMaker/README
-usr/share/WindowMaker/plmenu.fr
-usr/share/WindowMaker/menu.no
-usr/share/WindowMaker/menu.it
-usr/share/WindowMaker/plmenu.hr
-usr/share/WindowMaker/IconSets/Default.iconset
-usr/share/WindowMaker/menu.pl
-usr/share/WindowMaker/menu.el
-usr/share/WindowMaker/menu.zh_TW
-usr/share/WindowMaker/plmenu.zh_CN
-usr/share/WindowMaker/plmenu.zh_TW
-usr/share/WindowMaker/menu.gl
-usr/share/WindowMaker/menu.tr
-usr/share/WindowMaker/menu.zh_CN
-usr/share/WindowMaker/Pixmaps/*.xpm
-usr/share/WindowMaker/Pixmaps/*.png
-usr/share/WINGs/defaultIcon.xpm
-usr/share/WINGs/defaultIcon.tiff
-usr/share/WINGs/Images.xpm
-usr/share/WINGs/Images.tiff
-usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.xpm
+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/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
-# Scripts
-debian/debianfiles/wmaker usr/bin
-debian/debianfiles/upgrade-windowmaker-defaults usr/sbin
-# Theme
-debian/debianfiles/Theme/Debian
usr/share/WindowMaker/Themes
-debian/debianfiles/Theme/debian.tiff
usr/share/WindowMaker/Backgrounds
-# Configuration
-etc/WindowMaker/WMGLOBAL etc/GNUstep/Defaults
-etc/WindowMaker/WMState etc/GNUstep/Defaults
-debian/debianfiles/conf/WMWindowAttributes etc/GNUstep/Defaults
-debian/debianfiles/conf/WMRootMenu etc/GNUstep/Defaults
-debian/debianfiles/conf/WindowMaker etc/GNUstep/Defaults
-debian/debianfiles/wmaker-common.desktop usr/share/xsessions
-# Menu
-debian/debianfiles/menu/wmappearance etc/menu-methods
-# READMES, from the temporal path (see README section in debian/rules)
-README.po usr/share/doc/wmaker
-README.definable-cursor usr/share/doc/wmaker
-README.WPrefs usr/share/doc/wmaker
-README.WPrefs.po usr/share/doc/wmaker
+usr/share/locale/*/LC_MESSAGES/*.mo
diff --git a/debian/wmaker-common.manpages b/debian/wmaker-common.manpages
index a185795..c3481a3 100644
--- a/debian/wmaker-common.manpages
+++ b/debian/wmaker-common.manpages
@@ -1,3 +1,3 @@
+doc/WindowMaker.1
doc/upgrade-windowmaker-defaults.8
doc/wmaker.1
-doc/WindowMaker.1
diff --git a/debian/wmaker.dirs b/debian/wmaker.dirs
index 501f3d6..5144b95 100644
--- a/debian/wmaker.dirs
+++ b/debian/wmaker.dirs
@@ -1,2 +1,2 @@
-usr/lib/WindowMaker
usr/lib/GNUstep/System/Applications/WPrefs.app
+usr/lib/WindowMaker
diff --git a/debian/wmaker.install b/debian/wmaker.install
index adbbe8a..a393dbe 100644
--- a/debian/wmaker.install
+++ b/debian/wmaker.install
@@ -1,44 +1,43 @@
-usr/bin/wxcopy
-usr/bin/wmagnify
-usr/bin/wmmenugen
-usr/bin/wmgenmenu
-usr/bin/wmsetbg
-usr/bin/wdread
-usr/bin/wdwrite
+usr/bin/convertfonts usr/lib/WindowMaker
+usr/bin/geticonset
usr/bin/getstyle
usr/bin/seticons
-usr/bin/geticonset
usr/bin/setstyle
+usr/bin/wdread
+usr/bin/wdwrite
+usr/bin/wmagnify
+usr/bin/wmaker usr/lib/WindowMaker
+usr/bin/wmgenmenu
usr/bin/wmiv
+usr/bin/wmmenugen
+usr/bin/wmsetbg
+usr/bin/wxcopy
usr/bin/wxpaste
-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.1
+usr/share/man/cs/man1/geticonset.1
+usr/share/man/cs/man1/getstyle.1
+usr/share/man/cs/man1/seticons.1
+usr/share/man/cs/man1/setstyle.1
+usr/share/man/cs/man1/wdwrite.1
+usr/share/man/cs/man1/wmaker.1
+usr/share/man/cs/man1/wmsetbg.1
+usr/share/man/cs/man1/wxcopy.1
+usr/share/man/cs/man1/wxpaste.1
usr/share/man/ru/man1/geticonset.1
+usr/share/man/ru/man1/getstyle.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/ru/man1/wxcopy.1
+usr/share/man/ru/man1/wxpaste.1
usr/share/man/sk/man1/geticonset.1
+usr/share/man/sk/man1/getstyle.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
+usr/share/man/sk/man1/wxcopy.1
+usr/share/man/sk/man1/wxpaste.1
diff --git a/debian/wmaker.manpages b/debian/wmaker.manpages
index 1c93a1c..3a80e66 100644
--- a/debian/wmaker.manpages
+++ b/debian/wmaker.manpages
@@ -1,14 +1,14 @@
-doc/wmgenmenu.1
-doc/wdread.1
-doc/wmmenugen.1
+doc/WPrefs.1
doc/geticonset.1
doc/getstyle.1
doc/seticons.1
doc/setstyle.1
+doc/wdread.1
doc/wdwrite.1
doc/wmagnify.1
+doc/wmgenmenu.1
+doc/wmiv.1
+doc/wmmenugen.1
doc/wmsetbg.1
-doc/WPrefs.1
doc/wxcopy.1
doc/wxpaste.1
-doc/wmiv.1
--
2.5.0
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
