Makefile.am | 15 7 + 8 - 0 !
configure.ac | 2 0 + 2 - 0 !
2 files changed, 7 insertions(+), 10 deletions(-)

 remove ./debian directory included in upstream
 Upstream includes a ./debian directory, which causes an unfortunate
 conflict, since it was not initially fully policy compliant.  Also, I
 would prefer to use a debian directory that is in line with my
 packaging policy, and where the common parts are extracted out to a
 common sub category in arch.  Also included are changes that prevent
 the auto-tools from trying to regenerate the ./debian dir.
 .
 git-archimport-id: srivasta@debian.org--2003-primary/fvwm--debian--2.5--patch-1
 .
 Converted and metadata by Vincent W. Chen <vinmun@gmail.com>.

acinclude.m4 | 150 150 + 0 - 0 !
1 file changed, 150 insertions(+)

---

fvwm/ConfigFvwmSetup | 12 12 + 0 - 0 !
sample.fvwmrc/new-features | 40 40 + 0 - 0 !
sample.fvwmrc/system.fvwm2rc | 38 38 + 0 - 0 !
sample.fvwmrc/system.fvwm2rc-sample-1 | 40 40 + 0 - 0 !
sample.fvwmrc/system.fvwm2rc-sample-2 | 37 37 + 0 - 0 !
sample.fvwmrc/system.fvwm2rc-sample-95 | 25 16 + 9 - 0 !
6 files changed, 183 insertions(+), 9 deletions(-)

---

modules/FvwmConsole/FvwmConsole.1 | 4 3 + 1 - 0 !
modules/FvwmConsole/FvwmConsole.c | 4 3 + 1 - 0 !
modules/FvwmConsole/FvwmConsole.h | 3 2 + 1 - 0 !
3 files changed, 8 insertions(+), 3 deletions(-)

 changed hard-coded xterm into x-terminal-emulator per policy
 Changed the hard-coded xterm into x-terminal-emulator as per Debian policy
 .
 Also in keeping with Debian policy, change the option --title to -T,
 and removed the --name option. Changed the man page to document the
 Debian specific change.
 .
 git-archimport-id: srivasta@debian.org--2003-primary/fvwm--terminal-emulator--2.5--patch-1
 .
 Converted with metadata by Vincent W. Chen <vinmun@gmail.com>.

bin/fvwm-menu-directory.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

fvwm/builtins.c | 2 1 + 1 - 0 !
fvwm/misc.c | 11 7 + 4 - 0 !
fvwm/move_resize.c | 6 2 + 4 - 0 !
fvwm/virtual.c | 5 1 + 4 - 0 !
libs/FRenderInit.c | 2 1 + 1 - 0 !
modules/FvwmIconMan/debug.c | 5 4 + 1 - 0 !
modules/FvwmIconMan/functions.c | 3 1 + 2 - 0 !
7 files changed, 17 insertions(+), 17 deletions(-)

 [patch] comply with debian's hardening rules

So that FVWM complies with Debian's Hardening rules, ensure we patch FVWM to
fix a certain level of compiler warnings.  Command used for this:

make \
	CFLAGS="-I/usr/local/include -g -O2 -fstack-protector \
		--param=ssp-buffer-size=4 -Wformat -Werror=format-security" \
	LDFLAGS="-L/usr/local/lib"

configure.ac | 14 13 + 1 - 0 !
fvwm/builtins.c | 2 1 + 1 - 0 !
fvwm/events.c | 2 1 + 1 - 0 !
libs/Bindings.c | 2 1 + 1 - 0 !
modules/FvwmIconBox/FvwmIconBox.c | 4 2 + 2 - 0 !
modules/FvwmIconMan/readconfig.c | 2 1 + 1 - 0 !
modules/FvwmIconMan/x.c | 4 2 + 2 - 0 !
modules/FvwmScript/FvwmScript.c | 4 2 + 2 - 0 !
8 files changed, 23 insertions(+), 11 deletions(-)

 [patch] provide fvwm_keycodetokeysym() to handle xkeycodetokeysym()
 deprecation

X are deprecating XKeycodeToKeysym() in favour of XkbKeycodeToKeysym() --
however, older XServers will obviously not have access to XKB, so we have to
conditionally use the newer method only when it's available.

modules/FvwmAuto/FvwmAuto.1.in | 2 1 + 1 - 0 !
modules/FvwmButtons/FvwmButtons.1.in | 20 10 + 10 - 0 !
modules/FvwmTheme/FvwmTheme.1.in | 2 1 + 1 - 0 !
3 files changed, 12 insertions(+), 12 deletions(-)

 correct lintian manpage-has-errors-from-man
 Manpage macro errors, due to lines starting with apostrophe (') or period (.).
 http://lintian.debian.org/tags/manpage-has-errors-from-man.html

libs/FlocaleCharset.c | 2 1 + 1 - 0 !
modules/FvwmIconMan/readconfig.c | 2 1 + 1 - 0 !
modules/FvwmIconMan/winlist.c | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 correct lintian spelling-error-in-binary
 Correct misspellings in binary.
 http://lintian.debian.org/tags/spelling-error-in-binary.html

bin/fvwm-root.1.in | 4 2 + 2 - 0 !
doc/commands/BugOpts.xml | 2 1 + 1 - 0 !
doc/fvwm/images.xml | 2 1 + 1 - 0 !
doc/fvwm/xinerama.xml | 2 1 + 1 - 0 !
modules/FvwmButtons/FvwmButtons.1.in | 2 1 + 1 - 0 !
modules/FvwmDebug/FvwmDebug.1 | 4 2 + 2 - 0 !
modules/FvwmIconMan/FvwmIconMan.1.in | 2 1 + 1 - 0 !
modules/FvwmPager/FvwmPager.1.in | 2 1 + 1 - 0 !
modules/FvwmPerl/FvwmPerl.1 | 2 1 + 1 - 0 !
modules/FvwmProxy/FvwmProxy.1.in | 4 2 + 2 - 0 !
modules/FvwmScript/FvwmScript.1.in | 4 2 + 2 - 0 !
modules/FvwmTabs/FvwmTabs.1 | 2 1 + 1 - 0 !
12 files changed, 16 insertions(+), 16 deletions(-)

 correct lintian spelling-error-in-manpage
 Correct misspellings in manpages. For some reason had to modify *.1 files
 rather than *.in files for FvwmDebug, FvwmPerl, and FvwmTabs.
 http://lintian.debian.org/tags/spelling-error-in-manpage.html

fvwm/fvwm.c | 6 6 + 0 - 0 !
1 file changed, 6 insertions(+)

 provide debian menu entry by default
 Provide a Debian menu entry when the user has no config file.

fvwm/builtins.c | 2 1 + 1 - 0 !
fvwm/misc.c | 18 5 + 13 - 0 !
2 files changed, 6 insertions(+), 14 deletions(-)

 fix echo command in fvwm
 While fixing format security in format-security.patch, a format string has
 to be provided in addition to the string to be printed. In fvwm/misc.c, the