I've uploaded the following NMU to delayed-2: diff -u ssh-askpass-1.2.4.1/Imakefile ssh-askpass-1.2.4.1/Imakefile --- ssh-askpass-1.2.4.1/Imakefile +++ ssh-askpass-1.2.4.1/Imakefile @@ -24,7 +24,7 @@ XCOMM -------- configurable settings -------- BINDIR = /usr/lib/ssh -MANPATH = /usr/man +MANPATH = /usr/share/man MANDIR = $(MANPATH)/man1 APPDEFDIR = $(XAPPLOADDIR) APP_DEFAULTS = SshAskpass-default.ad diff -u ssh-askpass-1.2.4.1/Makefile ssh-askpass-1.2.4.1/Makefile --- ssh-askpass-1.2.4.1/Makefile +++ ssh-askpass-1.2.4.1/Makefile @@ -4,7 +4,7 @@ # ---------------------------------------------------------------------- # Makefile generated from "Imake.tmpl" and <Imakefile> # $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $ +# $XdotOrg: util/cf/Imake.tmpl,v 1.17 2006/04/15 15:55:25 herrb Exp $ # # # @@ -16,11 +16,13 @@ .SUFFIXES: .i -# $XdotOrg: xc/config/cf/Imake.cf,v 1.7 2005/03/02 11:20:29 gisburn Exp $ +# $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $ # $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ # $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ +# Keep cpp from replacing path elements containing i486/i586/i686 + # ----------------------------------------------------------------------- # site-specific configuration parameters that need to come before # the platform-specific parameters - edit site.def to change @@ -34,19 +36,19 @@ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change -# $XdotOrg: xc/config/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $ +# $XdotOrg: util/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $ # platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -# operating system: Linux 2.6.15.4-palm x86_64 [ELF] (2.6.15) +# operating system: Linux 2.6.17.7-grsec-cz01 x86_64 [ELF] (2.6.17) # libc: (6.3.6) -# binutils: (216) +# binutils: (217) # $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ # $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -# $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $ +# $XdotOrg: util/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $ # $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ @@ -95,7 +97,7 @@ # --------------------------------------------------------------------- # Imake rules for building libraries, programs, scripts, and data files # rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $ +# rules: $XdotOrg: util/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $ # # # @@ -108,7 +110,7 @@ X_BYTE_ORDER = X_LITTLE_ENDIAN -GLIDE2INCDIR = +GLIDE2INCDIR = /usr/include/glide GLIDE3INCDIR = /usr/include/glide3 @@ -173,12 +175,12 @@ # from top Makefile BOOTSTRAPCFLAGS = - CC = gcc - AS = gcc -c -x assembler + CC = gcc -m32 + AS = gcc -m32 -c -x assembler .SUFFIXES: .cc - CXX = c++ + CXX = c++ -m32 CXXFILT = c++filt @@ -188,7 +190,7 @@ CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(CXXPROJECT_DEFINES) + CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(CXXPROJECT_DEFINES) CXXOPTIONS = CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) @@ -199,12 +201,12 @@ CPP = cpp $(STD_CPP_DEFINES) RAWCPP = cpp -undef $(STD_CPP_OPTIONS) - PREPROCESSCMD = gcc -E $(STD_CPP_DEFINES) + PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) INSTALL = install INSTALLFLAGS = -c - LD = gcc -nostdlib + LD = gcc -m32 -nostdlib LEX = flex -l M4 = m4 @@ -268,14 +270,14 @@ COL = col COLFLAGS = -b - MODCC = gcc + MODCC = gcc -m32 MODCPP = cpp MODCFLAGS = $(CFLAGS) - MODAS = gcc -c -x assembler + MODAS = gcc -m32 -c -x assembler MODASFLAGS = - MODLD = gcc -nostdlib + MODLD = gcc -m32 -nostdlib MODLDFLAGS = MODLDCOMBINEFLAGS = -r @@ -288,8 +290,8 @@ STD_INCLUDES = STD_CPP_OPTIONS = -traditional - STD_CPP_DEFINES = -traditional -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) - STD_DEFINES = -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) + STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) + STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) EXTRA_LOAD_FLAGS = EXTRA_LDOPTIONS = EXTRA_LIBRARIES = @@ -373,7 +375,7 @@ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules -# $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $ +# $XdotOrg: util/cf/X11.tmpl,v 1.54 2006/04/15 15:55:25 herrb Exp $ # $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ # # @@ -410,6 +412,7 @@ INCDIR = $(INCROOT) ADMDIR = /usr/adm LIBDIR = /usr/lib/X11 + SHAREDIR = /usr/share/X11 LIBEXECDIR = /usr/libexec MODULEDIR = $(USRLIBDIR)/modules TOP_X_INCLUDES = @@ -1065,7 +1068,7 @@ # -------- configurable settings -------- BINDIR = /usr/lib/ssh -MANPATH = /usr/man +MANPATH = /usr/share/man MANDIR = $(MANPATH)/man1 APPDEFDIR = $(XAPPLOADDIR) APP_DEFAULTS = SshAskpass-default.ad diff -u ssh-askpass-1.2.4.1/debian/changelog ssh-askpass-1.2.4.1/debian/changelog --- ssh-askpass-1.2.4.1/debian/changelog +++ ssh-askpass-1.2.4.1/debian/changelog @@ -1,3 +1,14 @@ +ssh-askpass (1:1.2.4.1-6.1) unstable; urgency=medium + + * NMU + * Install man page into proper directory. Patch provided by + Vincent Crevot. Closes: #382114 + * Fix path to application ressource in man page to conform to X.org + layout + * Remove install-stamp on clean as well + + -- Helge Kreutzmann <[EMAIL PROTECTED]> Sat, 2 Sep 2006 18:13:36 +0200 + ssh-askpass (1:1.2.4.1-6) unstable; urgency=low * comment out a few irrelevant dh_whatever calls in debian/rules diff -u ssh-askpass-1.2.4.1/debian/rules ssh-askpass-1.2.4.1/debian/rules --- ssh-askpass-1.2.4.1/debian/rules +++ ssh-askpass-1.2.4.1/debian/rules @@ -19,7 +19,7 @@ clean: dh_testdir dh_testroot - rm -f build-stamp + rm -f build-stamp install-stamp # Add here commands to clean up after the build process. -$(MAKE) realclean @@ -35,6 +35,7 @@ # Add here commands to install the package into debian/ssh-askpass. $(MAKE) install install.man DESTDIR=`pwd`/debian/ssh-askpass rm -f debian/ssh-askpass/usr/lib/ssh/ssh-askpass + rm -f debian/ssh-askpass/usr/share/man/man1/ssh-askpass.1x touch install-stamp diff -u ssh-askpass-1.2.4.1/debian/postinst ssh-askpass-1.2.4.1/debian/postinst --- ssh-askpass-1.2.4.1/debian/postinst +++ ssh-askpass-1.2.4.1/debian/postinst @@ -24,7 +24,7 @@ case "$1" in configure) - update-alternatives --install /usr/bin/ssh-askpass ssh-askpass /usr/lib/ssh/x11-ssh-askpass 10 --slave /usr/share/man/man1/ssh-askpass.1.gz ssh-askpass.1.gz /usr/share/man/man1/x11-ssh-askpass.1.gz + update-alternatives --install /usr/bin/ssh-askpass ssh-askpass /usr/lib/ssh/x11-ssh-askpass 10 --slave /usr/share/man/man1/ssh-askpass.1.gz ssh-askpass.1.gz /usr/share/man/man1/x11-ssh-askpass.1x.gz # if the alternativ is a hanging link, revert to auto ls -L /etc/alternatives/ssh-askpass >/dev/null 2>&1 || \ diff -u ssh-askpass-1.2.4.1/debian/prerm ssh-askpass-1.2.4.1/debian/prerm --- ssh-askpass-1.2.4.1/debian/prerm +++ ssh-askpass-1.2.4.1/debian/prerm @@ -18,7 +18,7 @@ case "$1" in remove|deconfigure) update-alternatives --remove ssh-askpass /usr/lib/ssh/x11-ssh-askpass - update-alternatives --remove ssh-askpass /usr/share/man/man1/x11-ssh-askpass.1.gz + update-alternatives --remove ssh-askpass /usr/share/man/man1/x11-ssh-askpass.1x.gz # install-info --quiet --remove /usr/info/ssh-askpass.info.gz ;; upgrade) only in patch2: unchanged: --- ssh-askpass-1.2.4.1.orig/x11-ssh-askpass.man.in +++ ssh-askpass-1.2.4.1/x11-ssh-askpass.man.in @@ -276,8 +276,8 @@ the font to use for this button label. .El .Sh FILES -.Bl -tag -width "/usr/X11R6/lib/X11/app-defaults/SshAskpass" -compact -.It Pa /usr/X11R6/lib/X11/app-defaults/SshAskpass +.Bl -tag -width "/etc/X11/app-defaults/SshAskpass" -compact +.It Pa /etc/X11/app-defaults/SshAskpass .El .Sh SEE ALSO .Xr X 1 ,
-- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]