Hi Attached the patch for the version I intend to upload. Please respond if you don't want this NMU to happen, if you are working yourself on a patch or if you think that the attached patch won't work.
Cheers Luk -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u xnecview-1.34/Makefile xnecview-1.34/Makefile --- xnecview-1.34/Makefile +++ xnecview-1.34/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.6 2004/07/28 03:24:29 gisburn Exp $ +# $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $ # # # @@ -16,7 +16,7 @@ .SUFFIXES: .i -# $XdotOrg: xc/config/cf/Imake.cf,v 1.4 2004/08/11 21:14:01 kem Exp $ +# $XdotOrg: xc/config/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 $ @@ -36,23 +36,23 @@ # ---------------------------------------------------------------------- # platform-specific configuration parameters - edit linux.cf to change -# $XdotOrg: xc/config/cf/linux.cf,v 1.13 2004/08/11 21:14:01 kem Exp $ +# $XdotOrg: xc/config/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.12-1-k7 i686 [ELF] (2.6.12) +# operating system: Linux 2.6.15-1-k7 i686 [ELF] (2.6.15) # libc: (6.3.5) # binutils: (216) # $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.27.2.6 2005/01/24 03:11:42 gisburn Exp $ +# $XdotOrg: xc/config/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 $ -XORG_VERSION_CURRENT = (((6) * 10000000) + ((8) * 100000) + ((2) * 1000) + 0) +XORG_VERSION_CURRENT = (((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) RELEASE_VERSION = RELEASE-1 AFB_DEFS = -DUSE_AFB @@ -97,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.6 2004/08/13 17:21:43 krh Exp $ +# rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $ # # # @@ -190,7 +190,7 @@ CXXDEPENDINCLUDES = CXXEXTRA_DEFINES = CXXEXTRA_INCLUDES = - CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(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) @@ -262,8 +262,6 @@ TROFF = groff -Tps NROFF = nroff - HTMLROFF = groff -Thtml - MSMACROS = -ms MANMACROS = -man TBL = tbl @@ -292,8 +290,8 @@ STD_INCLUDES = STD_CPP_OPTIONS = -traditional - STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(PROJECT_DEFINES) - STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE $(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 = @@ -306,6 +304,9 @@ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) + NOSTDLIB = -nostdlib + POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic + PICFLAGS = -fPIC CXXPICFLAGS = -fPIC @@ -374,7 +375,7 @@ # ---------------------------------------------------------------------- # X Window System Build Parameters and Rules -# $XdotOrg: xc/config/cf/X11.tmpl,v 1.35.2.3 2005/02/01 04:07:39 gisburn Exp $ +# $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $ # $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ # # @@ -382,7 +383,7 @@ # # $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -XORGRELSTRING = `echo 6 8 2 | sed 's/ /./g'` +XORGRELSTRING = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` XORGMANNAME = X Version 11 STICKY_DEFINES = -DHAS_STICKY_DIR_BIT @@ -427,7 +428,7 @@ DOCPSDIR = $(DOCDIR)/PostScript DOCPDFDIR = $(DOCDIR)/PDF FONTDIR = $(LIBDIR)/fonts - ENCODINGSDIR = $(FONTDIR)/encodings + ENCODINGSDIR = $(LIBDIR)/fonts/encodings XINITDIR = $(LIBDIR)/xinit XDMDIR = $(LIBDIR)/xdm XDMVARDIR = $(VARLIBDIR)/xdm @@ -487,8 +488,8 @@ XTRANS_FAILDEFINES = -DFAIL_HARD VENDORMANNAME = X.Org - VENDORMANVERSION = `echo 6 8 2 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` - XORGMANDEFS = -D__xorgversion__="$(XORGRELSTRING) Release"' "$(XORGMANNAME)"' + VENDORMANVERSION = `echo 6 9 0 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` + XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" VENDORNAME = The X.Org Foundation VENDORNAMESHORT = X.Org @@ -618,24 +619,21 @@ DPSLIBSRC = $(LIBSRC)/dps -SODPSREV = 1.0 -DEPDPSLIB = +DEPDPSLIB = $(USRLIBDIR)/libdps.a DPSLIB = -ldps LINTDPS = $(LINTLIBDIR)/llib-ldps.ln DPSTKLIBSRC = $(LIBSRC)/dpstk -SODPSTKREV = 1.0 -DEPDPSTKLIB = +DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a DPSTKLIB = -ldpstk LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln PSRESLIBSRC = $(LIBSRC)/psres -SOPSRESREV = 1.0 -DEPPSRESLIB = +DEPPSRESLIB = $(USRLIBDIR)/libpsres.a PSRESLIB = -lpsres LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln @@ -853,7 +851,7 @@ ICESRC = $(LIBSRC)/ICE -SOICEREV = 6.3 +SOICEREV = 6.4 DEPICELIB = ICELIB = -lICE @@ -1131,7 +1129,7 @@ emptyrule:: cleandir:: - $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut grohtml*.png *-auto-*.png "#"* + $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* Makefile:: [EMAIL PROTECTED] [ -f Makefile ]; then set -x; \ diff -u xnecview-1.34/debian/changelog xnecview-1.34/debian/changelog --- xnecview-1.34/debian/changelog +++ xnecview-1.34/debian/changelog @@ -1,3 +1,11 @@ +xnecview (1.34-7.2) unstable; urgency=high + + * Non-maintainer upload. + * Ship manpages in /usr/share/man (Closes: #344230). + * Remove xlibs-dev build-dep. + + -- Luk Claes <[EMAIL PROTECTED]> Sun, 8 Jan 2006 00:44:52 +0100 + xnecview (1.34-7.1) unstable; urgency=medium * Non-maintainer upload. diff -u xnecview-1.34/debian/control xnecview-1.34/debian/control --- xnecview-1.34/debian/control +++ xnecview-1.34/debian/control @@ -3,7 +3,7 @@ Priority: extra Maintainer: Alan Bain <[EMAIL PROTECTED]> Standards-Version: 3.6.2.1 -Build-Depends: libpng12-dev,libgtk1.2-dev,xlibs-dev,xutils,libxaw7-dev +Build-Depends: libpng12-dev,libgtk1.2-dev,xutils,libxaw7-dev Package: xnecview Architecture: any diff -u xnecview-1.34/debian/dirs xnecview-1.34/debian/dirs --- xnecview-1.34/debian/dirs +++ xnecview-1.34/debian/dirs @@ -2 +2 @@ -usr/man/man1 +usr/share/man/man1 diff -u xnecview-1.34/debian/rules xnecview-1.34/debian/rules --- xnecview-1.34/debian/rules +++ xnecview-1.34/debian/rules @@ -33,8 +33,8 @@ cd debian/tmp && install -d `cat ../dirs` install -s -m 755 xnecview `pwd`/debian/tmp/usr/bin/xnecview install -o root -g root -m 0644 xnecview.1x \ - `pwd`/debian/tmp/usr/man/man1/xnecview.1 - gzip -9 `pwd`/debian/tmp/usr/man/man1/xnecview.1 + `pwd`/debian/tmp/usr/share/man/man1/xnecview.1 + gzip -9 `pwd`/debian/tmp/usr/share/man/man1/xnecview.1 cp debian/copyright debian/tmp/usr/share/doc/$(package)/. cp debian/changelog \
signature.asc
Description: OpenPGP digital signature