"Aaron M. Ucko" <[EMAIL PROTECTED]> writes: > I've attached a patch that fixes the paths, and also allows for the > fact that x_includes comes out empty nowadays; could you please apply > it, or at least authorize an NMU?
I meant to attach it, anyway; here it is now.
diff -u fvwm95-2.0.43ba/configure fvwm95-2.0.43ba/configure --- fvwm95-2.0.43ba/configure +++ fvwm95-2.0.43ba/configure @@ -2358,7 +2358,7 @@ fvwm_name="fvwm95" fvwm_rc=".fvwm95rc" -fvwm_icons="$x_includes/X11/bitmaps:$x_includes/X11/pixmaps:$prefix/icons" +fvwm_icons="${x_includes:-/usr/include}/X11/bitmaps:${x_includes:-/usr/include}/X11/pixmaps:$prefix/icons" if test "x$x_libraries" != x ; then x_libraries="-L$x_libraries" diff -u fvwm95-2.0.43ba/configure.in fvwm95-2.0.43ba/configure.in --- fvwm95-2.0.43ba/configure.in +++ fvwm95-2.0.43ba/configure.in @@ -168,7 +168,7 @@ fvwm_name="fvwm95" fvwm_rc=".fvwm95rc" -fvwm_icons="$x_includes/X11/bitmaps:$x_includes/X11/pixmaps:$prefix/icons" +fvwm_icons="${x_includes:-/usr/include}/X11/bitmaps:${x_includes:-/usr/include}/X11/pixmaps:$prefix/icons" if test "x$x_libraries" != x ; then x_libraries="-L$x_libraries" diff -u fvwm95-2.0.43ba/debian/rules fvwm95-2.0.43ba/debian/rules --- fvwm95-2.0.43ba/debian/rules +++ fvwm95-2.0.43ba/debian/rules @@ -32,7 +32,7 @@ $(checkdir) (INSTALL_PROGRAM="/usr/bin/install -s"; export INSTALL_PROGRAM ; \ CFLAGS="-O2 -g -Wall -Wno-unused"; export CFLAGS ; \ - ./configure --prefix=/usr/X11R6) + ./configure --prefix=/usr) touch stamp-configure build: stamp-build @@ -84,30 +84,30 @@ $(checkdir) -rm -rf $(package_tmp) $(make_directory) $(package_tmp) $(package_tmp)/DEBIAN - $(make_directory) $(package_tmp)/usr/X11R6/bin - $(make_directory) $(package_tmp)/usr/X11R6/lib - $(make_directory) $(package_tmp)/usr/X11R6/lib/X11/fvwm95 + $(make_directory) $(package_tmp)/usr/bin + $(make_directory) $(package_tmp)/usr/lib + $(make_directory) $(package_tmp)/usr/lib/X11/fvwm95 $(make_directory) $(package_tmp)/etc/X11/fvwm95 $(make_directory) $(package_tmp)/etc/X11/fvwm95/.fvwm95 - $(make_directory) $(package_tmp)/usr/X11R6/man/man{1,5} + $(make_directory) $(package_tmp)/usr/share/man/man{1,5} $(make_directory) $(package_tmp)/usr/lib/menu $(make_directory) $(package_tmp)/usr/share/doc $(package_tmp)/usr/share/doc/fvwm95 $(make_directory) $(package_tmp)/usr/share/xsessions $(make_directory) $(package_tmp)/etc/menu-methods @for i in ${package_subdirs}; do \ echo Installing in $$i ; \ - (cd $$i; $(MAKE) install prefix=$(package_tmp_a)/usr/X11R6 \ - fvwm_dir=$(package_tmp_a)/usr/X11R6/lib/X11/fvwm95 \ - man_dir=$(package_tmp_a)/usr/X11R6/man/man5 \ + (cd $$i; $(MAKE) install prefix=$(package_tmp_a)/usr \ + fvwm_dir=$(package_tmp_a)/usr/lib/X11/fvwm95 \ + man_dir=$(package_tmp_a)/usr/share/man/man5 \ icon_dir=$(package_tmp_a)/usr/share/fvwm95/icons) \ done - (cd $(package_tmp)/usr/X11R6/man/man5; rm -f fvwm95.1 fvwm95.1x; \ + (cd $(package_tmp)/usr/share/man/man5; rm -f fvwm95.1 fvwm95.1x; \ for i in *.1; do \ mv $$i `basename $$i .1`.5fvwm95; \ done) - test -f $(package_tmp)/usr/X11R6/man/man1/fvwm95.1x || \ - $(install_file) fvwm/fvwm95.man $(package_tmp)/usr/X11R6/man/man1/fvwm95.1x + test -f $(package_tmp)/usr/share/man/man1/fvwm95.1x || \ + $(install_file) fvwm/fvwm95.man $(package_tmp)/usr/share/man/man1/fvwm95.1x $(install_file) sample.fvwmrc/system.fvwm95rc \ $(package_tmp)/usr/share/doc/fvwm95/ @@ -120,14 +120,14 @@ mv $(package_tmp)/etc/X11/fvwm95/null.hook \ $(package_tmp)/etc/X11/fvwm95/.fvwm95/null.hook ln -s /etc/X11/fvwm95/system.fvwm95rc \ - $(package_tmp)/usr/X11R6/lib/X11/fvwm95/.fvwm95rc + $(package_tmp)/usr/lib/X11/fvwm95/.fvwm95rc ln -s /etc/X11/fvwm95/.fvwm95 \ - $(package_tmp)/usr/X11R6/lib/X11/fvwm95/.fvwm95 + $(package_tmp)/usr/lib/X11/fvwm95/.fvwm95 (cd $(package_tmp)/etc/X11/fvwm95/.fvwm95; \ for i in init-restart.hook main-menu.hook post.hook init.hook \ menudefs.hook pre.hook main-menu-pre.hook restart.hook; \ do ln -s null.hook $$i; done) - mv $(package_tmp)/usr/X11R6/lib/X11/fvwm95/scripts \ + mv $(package_tmp)/usr/lib/X11/fvwm95/scripts \ $(package_tmp)/usr/share/doc/fvwm95/FvwmScript-examples #Debian menus $(install_program) debian/menu-method $(package_tmp)/etc/menu-methods/fvwm95 @@ -147,7 +147,7 @@ $(install_file) `cat debian/examples` \ $(package_tmp)/usr/share/doc/$(package)/examples gzip -9frq $(package_tmp)/usr/share/doc/$(package) - gzip -9fqr $(package_tmp)/usr/X11R6/man + gzip -9fqr $(package_tmp)/usr/share/man $(install_file) debian/copyright \ $(package_tmp)/usr/share/doc/$(package)/copyright $(install_file) debian/changelog $(package_tmp)/usr/share/doc/$(package)/changelog.Debian @@ -158,8 +158,8 @@ $(install_program) debian/prerm $(package_tmp)/DEBIAN/prerm $(install_program) debian/postinst $(package_tmp)/DEBIAN/postinst $(install_program) debian/postrm $(package_tmp)/DEBIAN/postrm - dpkg-shlibdeps $(package_tmp)/usr/X11R6/bin/fvwm95 \ - $(package_tmp)/usr/X11R6/lib/X11/fvwm95/Fvwm* + dpkg-shlibdeps $(package_tmp)/usr/bin/fvwm95 \ + $(package_tmp)/usr/lib/X11/fvwm95/Fvwm* dpkg-gencontrol -isp -p$(package) -P$(package_tmp) chown -R root.root $(package_tmp) chmod -R g-ws $(package_tmp) diff -u fvwm95-2.0.43ba/debian/fvwm95rc fvwm95-2.0.43ba/debian/fvwm95rc --- fvwm95-2.0.43ba/debian/fvwm95rc +++ fvwm95-2.0.43ba/debian/fvwm95rc @@ -106,9 +106,9 @@ # Module path and paths to the icons # ModulePath is a colon-separated list, just like regular unix PATH # -ModulePath /usr/X11R6/lib/X11/fvwm95/ -PixmapPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/include/X11/pixmaps:/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/pixmaps:/usr/X11R6/include/bitmaps -IconPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/include/X11/pixmaps:/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/pixmaps:/usr/X11R6/include/bitmaps +ModulePath /usr/lib/X11/fvwm95/ +PixmapPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/include/X11/pixmaps:/usr/include/X11/bitmaps:/usr/include/pixmaps:/usr/include/bitmaps +IconPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/include/X11/pixmaps:/usr/include/X11/bitmaps:/usr/include/pixmaps:/usr/include/bitmaps #========================================================================# # Set the decoration styles and window options @@ -608,7 +608,7 @@ #The taskbar now has plugins... *FvwmTaskBarGoodyLoadableQuiet -*FvwmTaskBarGoodyLoadablePlugins /usr/X11R6/lib/X11/fvwm95/plugins +*FvwmTaskBarGoodyLoadablePlugins /usr/lib/X11/fvwm95/plugins *FvwmTaskBarGoodyLoadableSymbol CheckLockModuleSymbol *FvwmTaskBarGoodyLoadableId .Modem diff -u fvwm95-2.0.43ba/debian/postinst fvwm95-2.0.43ba/debian/postinst --- fvwm95-2.0.43ba/debian/postinst +++ fvwm95-2.0.43ba/debian/postinst @@ -15,7 +15,7 @@ # are already fully installed and configured. package=fvwm95 -binfile=/usr/bin/X11/fvwm95 +binfile=/usr/bin/fvwm95 # Prioirty 49 instead of 50 because fvwm95 is a bit old and is # unmaintained upstream @@ -24,7 +24,7 @@ update-alternatives --install /usr/bin/x-window-manager \ x-window-manager $binfile 49 \ --slave /usr/share/man/man1/x-window-manager.1.gz \ - x-window-manager.1.gz /usr/X11R6/man/man1/fvwm95.1x.gz + x-window-manager.1.gz /usr/share/man/man1/fvwm95.1x.gz rm -rf /etc/X11/fvwm95/deleteme chmod a+rx /etc/menu-methods/fvwm95 if [ -x /usr/bin/update-menus ] ; then diff -u fvwm95-2.0.43ba/debian/system.fvwm95rc-ja fvwm95-2.0.43ba/debian/system.fvwm95rc-ja --- fvwm95-2.0.43ba/debian/system.fvwm95rc-ja +++ fvwm95-2.0.43ba/debian/system.fvwm95rc-ja @@ -119,9 +119,9 @@ # Module path and paths to the icons # ModulePath is a colon-separated list, just like regular unix PATH # -ModulePath /usr/X11R6/lib/X11/fvwm95/ -PixmapPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/include/X11/pixmaps:/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/pixmaps:/usr/X11R6/include/bitmaps -IconPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/include/X11/pixmaps:/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/pixmaps:/usr/X11R6/include/bitmaps +ModulePath /usr/lib/X11/fvwm95/ +PixmapPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/include/X11/pixmaps:/usr/include/X11/bitmaps:/usr/include/pixmaps:/usr/include/bitmaps +IconPath .fvwm95/icons:.fvwm95/icons:.icons:/usr/local/share/fvwm95/icons:/usr/local/share/fvwm95/mini-icons:/usr/local/share/icons:/usr/share/fvwm95/icons:/usr/share/fvwm95/mini-icons:/usr/share/icons:/usr/share/pixmaps:/usr/include/X11/pixmaps:/usr/include/X11/bitmaps:/usr/include/pixmaps:/usr/include/bitmaps #========================================================================# # Set the decoration styles and window options @@ -678,7 +678,7 @@ #The taskbar now has plugins... *FvwmTaskBarGoodyLoadableQuiet -*FvwmTaskBarGoodyLoadablePlugins /usr/X11R6/lib/X11/fvwm95/plugins +*FvwmTaskBarGoodyLoadablePlugins /usr/lib/X11/fvwm95/plugins *FvwmTaskBarGoodyLoadableSymbol CheckLockModuleSymbol *FvwmTaskBarGoodyLoadableId .Modem
-- Aaron M. Ucko, KB1CJC (amu at alum.mit.edu, ucko at debian.org) Finger [EMAIL PROTECTED] (NOT a valid e-mail address) for more info.