diff --git a/Makefile.in b/Makefile.in index 8af5ad4..71cc0b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,11 +15,11 @@ -lX11 @X_EXTRA_LIBS@ @LIBS@ prefix = @prefix@ exec_prefix = @exec_prefix@ -bindir = $(DESTDIR)/usr/X11R6/bin +bindir = $(DESTDIR)/usr/bin obindir = $(DESTDIR)/usr/bin -libdir = $(DESTDIR)/usr/X11R6/lib/X11 +libdir = $(DESTDIR)/usr/lib mandir = $(DESTDIR)/usr/share/man -xmandir = $(DESTDIR)/usr/X11R6/man +xmandir = $(DESTDIR)/usr/share/man INSTALL = @INSTALL@ LN_S = @LN_S@ RM = -rm -f @@ -101,6 +101,7 @@ $(INSTALL) -m 644 system.map $(AMIWM_HOME)/system.map $(INSTALL) -m 644 magicwb.map $(AMIWM_HOME)/magicwb.map $(INSTALL) -m 644 schwartz.map $(AMIWM_HOME)/schwartz.map + -mkdir -p $(EXAMPLES) $(INSTALL) -m 755 Xsession $(EXAMPLES)/Xsession $(INSTALL) -m 755 Xsession2 $(EXAMPLES)/Xsession2 $(INSTALL) -m 755 Xinitrc $(EXAMPLES)/Xinitrc @@ -108,7 +109,7 @@ $(INSTALL) -s amiwm $(bindir)/amiwm $(INSTALL) -s ppmtoinfo $(obindir)/ppmtoinfo $(RM) $(obindir)/requestchoice - $(LN_S) ../X11R6/lib/X11/amiwm/requestchoice $(obindir)/requestchoice + $(LN_S) ../lib/amiwm/requestchoice $(obindir)/requestchoice -mkdir -p $(mandir)/man1 $(INSTALL) -m 644 amiwm.1 $(xmandir)/man1/amiwm.1 $(INSTALL) -m 644 debian/ppmtoinfo.1 $(mandir)/man1/ppmtoinfo.1 diff --git a/amiwm.1 b/amiwm.1 index 9f9096b..d95fcac 100644 --- a/amiwm.1 +++ b/amiwm.1 @@ -10,7 +10,7 @@ .SH DESCRIPTION .I amiwm is an X Window manager that tries to make your workstation look like -an Amiga®. +an Amiga\*R. .SH OPTIONS .I Amiwm diff --git a/debian/README.Debian b/debian/README.Debian index 84d7434..98fb8c1 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,8 +1,12 @@ amiwm for Debian ----------------------- +---------------- This is the Amiga look-alike window manager. Since AmiWM can't do menus of more than one level depth, it doesn't integrate into debian's menu interface. +-> Yes it can. I've had a hack of debian menus with the help + of Bill Allombert. + +You might want to run xterm with -bg gray70 -fg black. -- Jorgen Schaefer , Tue, 29 Feb 2000 06:20:08 +0100 diff --git a/debian/changelog b/debian/changelog index d34db3f..0ddf084 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +amiwm (0.20.48-6) unstable; urgency=low + + * Updated build depends for sid. + * New maintainer. (closes: #324367) + * Bumped standards version. + * Removed default dh comments from debian/ manual pages and rules. + * Update Makefile.in paths. + * Add a user configuration example. + * Fixed manual pages (escape minus). + + -- Gürkan Sengün Sat, 6 Aug 2005 15:53:06 +0200 + amiwm (0.20.48-5) unstable; urgency=low * Added Build-Depends: debhelper (closes: #109952) diff --git a/debian/control b/debian/control index 395545d..0a6ac24 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,16 @@ Source: amiwm Section: non-free/x11 Priority: optional -Maintainer: Jorgen Schaefer -Build-Depends: debhelper, xlib6g-dev, libxpm4-dev, flex, bison -Standards-Version: 3.0.1 +Maintainer: Gürkan Sengün +Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxpm4-dev, flex, bison +Standards-Version: 3.6.2 Package: amiwm Architecture: any Depends: ${shlibs:Depends} Recommends: xfonts-75dpi Provides: x-window-manager -Description: The Amiga look-alike window manager +Description: The Amiga look alike window manager This is amiwm, an X window manager that tries to make your workstation look like an Amiga. "Why?" you ask. Because the author wanted it to. So there! diff --git a/debian/dirs b/debian/dirs index 5062f83..26abffd 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,5 +1,3 @@ usr/bin usr/share/doc/amiwm/examples usr/share/man/man1 -usr/X11R6/man/man1 -usr/X11R6/bin diff --git a/debian/docs b/debian/docs index dea0cab..a310d1f 100644 --- a/debian/docs +++ b/debian/docs @@ -1,3 +1,2 @@ -INSTALL README README.modules diff --git a/debian/dotamiwmrc.example b/debian/dotamiwmrc.example new file mode 100644 index 0000000..8e629e2 --- /dev/null +++ b/debian/dotamiwmrc.example @@ -0,0 +1,24 @@ +ScreenFont "fixed" +IconFont "fixed" +FastQuit yes +ForceMove always +AutoRaise yes +Focus sloppy + +Screen "desk one" +#Module "Background" "-fullscreen /usr/share/amiwm/amiga.jpg" +Screen "desk two" + +ToolItem "xterm" "xterm" "" +ToolItem "xman" "xman" "" +ToolItem Separator +ToolItem "System" { + ToolItem "worker" "worker" "" + ToolItem "endeavour2" "endeavour2" "" + ToolItem "xclock" "xclock" "" + ToolItem "xosview" "xosview" "" + ToolItem "xtrlock" "xtrlock" "" +} +ToolItem "Sound" { + ToolItem "aumix" "xterm -e aumix" "" +} diff --git a/debian/menu b/debian/menu index d8b8316..061533a 100644 --- a/debian/menu +++ b/debian/menu @@ -1,6 +1,6 @@ ?package(amiwm):\ - needs=wm\ - section=WindowManagers\ + needs="wm"\ + section="WindowManagers"\ longtitle="AmiWM: Amiga look-alike Window Manager"\ title="amiwm"\ - command="/usr/X11/bin/amiwm" + command="/usr/bin/amiwm" diff --git a/debian/postinst.debhelper b/debian/postinst.debhelper new file mode 100644 index 0000000..e85c3ab --- /dev/null +++ b/debian/postinst.debhelper @@ -0,0 +1,11 @@ +# Automatically added by dh_installmenu +if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then + update-menus +fi +# End automatically added section +# Automatically added by dh_installwm +if [ "$1" = "configure" ]; then + update-alternatives --install /usr/bin/x-window-manager \ + x-window-manager /usr/bin/X11/amiwm 20 +fi +# End automatically added section diff --git a/debian/postrm.debhelper b/debian/postrm.debhelper new file mode 100644 index 0000000..2b4be4f --- /dev/null +++ b/debian/postrm.debhelper @@ -0,0 +1,3 @@ +# Automatically added by dh_installmenu +if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi +# End automatically added section diff --git a/debian/ppmtoinfo.1 b/debian/ppmtoinfo.1 index ff53528..408dd06 100644 --- a/debian/ppmtoinfo.1 +++ b/debian/ppmtoinfo.1 @@ -1,25 +1,9 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) .TH ppmtoinfo 1 "March 3, 2000" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) .SH NAME ppmtoinfo \- convert a portable pixmap into an Amiga .info file .SH SYNOPSIS .B ppmtoinfo -[-type icontype] [-floyd|-fs] [-map mapfile] [ppmfile] [ppmfile] +[\-type icontype] [\-floyd|\-fs] [\-map mapfile] [ppmfile] [ppmfile] .SH DESCRIPTION This manpage documents briefly the .B ppmtoinfo @@ -27,9 +11,6 @@ This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. .PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. .B ppmtoinfo is a program that converts portable pixmap (.ppm) files into the Amiga info format which is used to store icons as. @@ -39,14 +20,14 @@ set the type of the icon. .TP .B \-floyd, \-fs -Enable Floyd-Steinberg +Enable Floyd\-Steinberg .TP .BI \-map " mapfile" Use the map file mapfile .br .SH ICON TYPES The -.B -type +.B \-type option lets you set the type of the icon you creat. The parameter can be any of .TP diff --git a/debian/prerm.debhelper b/debian/prerm.debhelper new file mode 100644 index 0000000..a145673 --- /dev/null +++ b/debian/prerm.debhelper @@ -0,0 +1,5 @@ +# Automatically added by dh_installwm +if [ "$1" = "remove" ]; then + update-alternatives --remove x-window-manager /usr/bin/X11/amiwm +fi +# End automatically added section diff --git a/debian/requestchoice.1 b/debian/requestchoice.1 index 4110c99..ad71f90 100644 --- a/debian/requestchoice.1 +++ b/debian/requestchoice.1 @@ -1,20 +1,4 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) .TH requestchoice 1 "March 3, 2000" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) .SH NAME requestchoice \- request a user choice .SH SYNOPSIS @@ -27,9 +11,6 @@ This manual page was written for the Debian GNU/Linux distribution because the original program does not have a manual page. .PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. .B requestchoice is a program that pops up a window with a title, a textarea, and one or more buttons from which the user can chose one. diff --git a/debian/rules b/debian/rules index 29d9703..8a237d3 100755 --- a/debian/rules +++ b/debian/rules @@ -6,26 +6,20 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=1 +export DH_COMPAT=4 build: build-stamp build-stamp: dh_testdir - ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info - # Add here commands to compile the package. $(MAKE) - touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp - - # Add here commands to clean up after the build process. -$(MAKE) distclean - dh_clean install: build @@ -33,9 +27,8 @@ dh_testroot dh_clean -k dh_installdirs - - # Add here commands to install the package into debian/tmp. - $(MAKE) install prefix=`pwd`/debian/tmp/usr DESTDIR=`pwd`/debian/tmp + $(MAKE) install prefix=`pwd`/debian/amiwm/usr DESTDIR=`pwd`/debian/amiwm + cp debian/dotamiwmrc.example debian/amiwm/usr/share/doc/amiwm/examples/dotamiwmrc # Build architecture-independent files here. binary-indep: build install @@ -43,31 +36,20 @@ # Build architecture-dependent files here. binary-arch: build install -# dh_testversion dh_testdir dh_testroot -# dh_installdebconf dh_installdocs dh_installexamples dh_installmenu -# dh_installemacsen -# dh_installpam -# dh_installinit -# dh_installcron # dh_installmanpages -# dh_installinfo -# dh_undocumented dh_installchangelogs dh_link dh_strip dh_compress dh_fixperms - dh_installwm --priority 20 /usr/bin/X11/amiwm - # You may want to make some executables suid here. -# dh_suidregister + dh_installwm --priority 20 /usr/bin/amiwm # dh_makeshlibs dh_installdeb -# dh_perl dh_shlibdeps dh_gencontrol dh_md5sums diff --git a/debian/substvars b/debian/substvars new file mode 100644 index 0000000..191fc46 --- /dev/null +++ b/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3.5-1), libice6 | xlibs (>> 4.1.0), libsm6 | xlibs (>> 4.1.0), libx11-6 | xlibs (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), libxmu6 | xlibs (>> 4.1.0) diff --git a/lex.l b/lex.l index 89eeca1..1e05f54 100644 --- a/lex.l +++ b/lex.l @@ -6,6 +6,7 @@ extern FILE *rcfile; #undef yyin #define yyin rcfile +#define YY_SKIP_YYWRAP #define yywrap() 1 extern int parse_keyword(char *); void fixup_string(char *, char *);