Please unblock xfig 1:3.2.5-rel-3 because it fixes several important bugs with a very small patch:
diff -u xfig-3.2.5-rel/debian/changelog xfig-3.2.5-rel/debian/changelog --- xfig-3.2.5-rel/debian/changelog +++ xfig-3.2.5-rel/debian/changelog @@ -1,3 +1,22 @@ +xfig (1:3.2.5-rel-3) unstable; urgency=low + + * Remove trailing space from debian/patches/00list to make lintian happy. + * Stop ignoring "make clean" errors in debian/rules. + * xfig-doc.doc-base: Change section from Apps/Graphics to Graphics. + * menu: Change section Apps/Graphics to Applications/Graphics. + * Upgrade to Standards-Version 3.8.0: + - Fix Homepage header in control file. + * Build-Depend on xutils-dev instead of xutils (Closes: #485545). + * Suggest ghostscript instead of gs now. + * Suggest cups-client instead of cupsys-client now. + * 23_modepanel_width: finally fixed size of mode panel so it doesn't + cover indicator panel under certain circumstances (backported from + unreleased 3.2.5a by Brian V. Smith) (Closes: #427960). + * 24_lp_printer_fixup: Fix printer selection option if lp is used + (instead of lpr) (Closes: #443832). + + -- Roland Rosenfeld <[EMAIL PROTECTED]> Sun, 05 Oct 2008 15:49:56 +0200 + xfig (1:3.2.5-rel-2) unstable; urgency=low * 22_kfreebsd: tweak to build on GNU/kFreeBSD (Closes: #430358). diff -u xfig-3.2.5-rel/debian/control xfig-3.2.5-rel/debian/control --- xfig-3.2.5-rel/debian/control +++ xfig-3.2.5-rel/debian/control @@ -2,14 +2,15 @@ Section: graphics Priority: optional Maintainer: Roland Rosenfeld <[EMAIL PROTECTED]> -Standards-Version: 3.7.2 -Build-Depends: dpatch, dpkg (>= 1.7.2), debhelper (>= 5), libxt-dev, libxpm-dev, libx11-dev, libxi-dev, xutils, xaw3dg-dev (>= 1.5+E-2), libjpeg62-dev, libpng12-dev | libpng-dev +Standards-Version: 3.8.0 +Build-Depends: dpatch, dpkg (>= 1.7.2), debhelper (>= 5), libxt-dev, libxpm-dev, libx11-dev, libxi-dev, xutils-dev, xaw3dg-dev (>= 1.5+E-2), libjpeg62-dev, libpng12-dev | libpng-dev +Homepage: http://www-epb.lbl.gov/xfig/ Package: xfig Architecture: any Depends: ${shlibs:Depends} Recommends: transfig (>= 1:3.2.5-alpha4-1), xfig-libs -Suggests: gimp, xfig-doc (>= 1:3.2.5-alpha4-1), gs, gsfonts-x11 (>= 0.7), netpbm, spell, cupsys-client | lpr +Suggests: gimp, xfig-doc (>= 1:3.2.5-alpha4-1), ghostscript, gsfonts-x11 (>= 0.7), netpbm, spell, cups-client | lpr Conflicts: xfig-doc (<< 1:3.2.5-alpha4-1), transfig (<< 1:3.2.5-alpha4-1) Description: Facility for Interactive Generation of figures under X11 XFig is a menu-driven tool that allows the user to draw and manipulate objects @@ -23,8 +24,6 @@ to several common formats. You should also think about installing xfig-doc, which contains the documentation and xfig-libs, which contains several clip art libraries. - . - Homepage: http://www-epb.lbl.gov/xfig/ Package: xfig-doc Section: doc @@ -38,8 +37,6 @@ . This package contains on-line documentation in HTML and PDF formats as well as the graphics examples distributed with XFig. - . - Homepage: http://www-epb.lbl.gov/xfig/ Package: xfig-libs Section: graphics @@ -61,2 +57,0 @@ - . - Homepage: http://www-epb.lbl.gov/xfig/ diff -u xfig-3.2.5-rel/debian/menu xfig-3.2.5-rel/debian/menu --- xfig-3.2.5-rel/debian/menu +++ xfig-3.2.5-rel/debian/menu @@ -4,7 +4,7 @@ icon32x32="/usr/share/pixmaps/xfig32x32.xpm" \ icon16x16="/usr/share/pixmaps/xfig16x16.xpm" \ icon="/usr/share/pixmaps/xfig32x32cmap.xpm" \ - section="Apps/Graphics" \ + section="Applications/Graphics" \ hints="Drawing,Draw,Vector" \ title="xfig" \ longtitle="Facility for Interactive Generation of figures" \ diff -u xfig-3.2.5-rel/debian/rules xfig-3.2.5-rel/debian/rules --- xfig-3.2.5-rel/debian/rules +++ xfig-3.2.5-rel/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f # -# (C) 1999-2006 Roland Rosenfeld <[EMAIL PROTECTED]>, based on +# (C) 1999-2008 Roland Rosenfeld <[EMAIL PROTECTED]>, based on # Sample debian/rules that uses debhelper. # This file is public domain software, originally written by Joey Hess. @@ -33,7 +33,7 @@ dh_testroot rm -f build-stamp - -$(MAKE) clean + [ ! -f Makefile ] || $(MAKE) clean rm -f Makefile* xfig.man dh_clean diff -u xfig-3.2.5-rel/debian/xfig-doc.doc-base xfig-3.2.5-rel/debian/xfig-doc.doc-base --- xfig-3.2.5-rel/debian/xfig-doc.doc-base +++ xfig-3.2.5-rel/debian/xfig-doc.doc-base @@ -5,7 +5,7 @@ which runs under the X Window System. It explains how to start and use xfig, helps you with some examples and informs you about the technical issues of this program. -Section: Apps/Graphics +Section: Graphics Format: html Index: /usr/share/doc/xfig/html/index.html diff -u xfig-3.2.5-rel/debian/patches/00list xfig-3.2.5-rel/debian/patches/00list --- xfig-3.2.5-rel/debian/patches/00list +++ xfig-3.2.5-rel/debian/patches/00list @@ -14,7 +14,9 @@ -14_manpage_fixsyntax.dpatch +14_manpage_fixsyntax.dpatch 15_lp_or_lpr.dpatch 16_man_rigidtext.dpatch 19_xaw3d1_5e_fix.dpatch 20_nodebugout.dpatch 21_Imake_jhtml_fix.dpatch 22_kfreebsd.dpatch +23_modepanel_width.dpatch +24_lp_printer_fixup.dpatch only in patch2: unchanged: --- xfig-3.2.5-rel.orig/debian/patches/23_modepanel_width.dpatch +++ xfig-3.2.5-rel/debian/patches/23_modepanel_width.dpatch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 23_modepanel_width.dpatch by Brian V. Smith +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: finally fixed size of mode panel so it doesn't cover indicator +## DP: panel under certain circumstances (backported from unreleased +## DP: 3.2.5a). + [EMAIL PROTECTED]@ +diff -urNad xfig~/w_setup.c xfig/w_setup.c +--- xfig~/w_setup.c ++++ xfig/w_setup.c +@@ -23,8 +23,6 @@ + #include "w_setup.h" + #include "w_util.h" + +-#define NUM_DRAW_SW 17 /* kludge - shouldn't have to edit this by hand */ +- + int TOOL_WD, TOOL_HT; + int CMDFORM_WD, CMDFORM_HT = CMD_BUT_HT; + int NAMEPANEL_WD; +@@ -94,8 +92,7 @@ + + /* space for both modepanel titles (Drawing modes and Editing modes) */ + MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD - +- (MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) + +- ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW)); ++ (MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_MODE_SW/SW_PER_ROW) + 1); + if (MODEPANEL_SPACE < 2) + MODEPANEL_SPACE = 2; + } only in patch2: unchanged: --- xfig-3.2.5-rel.orig/debian/patches/24_lp_printer_fixup.dpatch +++ xfig-3.2.5-rel/debian/patches/24_lp_printer_fixup.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 24_lp_printer_fixup.dpatch by Roland Rosenfeld <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix printer selection option if lp is used (instead of lpr) + [EMAIL PROTECTED]@ +diff -urNad xfig~/u_print.c xfig/u_print.c +--- xfig~/u_print.c ++++ xfig/u_print.c +@@ -631,9 +631,10 @@ + printer, + shell_protect_string(file)); + #else +- sprintf(cmd, "%s %s -P%s %s", ++ sprintf(cmd, "%s %s %s%s %s", + access("/usr/bin/lp", X_OK)?"lpr":"lp", + pr_params, ++ access("/usr/bin/lp", X_OK)?"-P":"-d", + printer, + shell_protect_string(file)); + #endif /* (defined(SYSV) || defined(SVR4)) && !defined(BSDLPR) */ Tschoeeee Roland -- * [EMAIL PROTECTED] * http://www.spinnaker.de/ * -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
