--- libxaw-1.0.12.orig/debian/README.source +++ libxaw-1.0.12/debian/README.source @@ -0,0 +1,49 @@ +------------------------------------------------------ +Quick Guide To Patching This Package For The Impatient +------------------------------------------------------ + +1. Make sure you have quilt installed +2. Unpack the package as usual with "dpkg-source -x" +3. Run the "patch" target in debian/rules +4. Create a new patch with "quilt new" (see quilt(1)) +5. Edit all the files you want to include in the patch with "quilt edit" + (see quilt(1)). +6. Write the patch with "quilt refresh" (see quilt(1)) +7. Run the "clean" target in debian/rules + +Alternatively, instead of using quilt directly, you can drop the patch in to +debian/patches and add the name of the patch to debian/patches/series. + +------------------------------------ +Guide To The X Strike Force Packages +------------------------------------ + +The X Strike Force team maintains X packages in git repositories on +git.debian.org in the pkg-xorg subdirectory. Most upstream packages +are actually maintained in git repositories as well, so they often +just need to be pulled into git.debian.org in a "upstream-*" branch. +Otherwise, the upstream sources are manually installed in the Debian +git repository. + +The .orig.tar.gz upstream source file could be generated this +"upstream-*" branch in the Debian git repository but it is actually +copied from upstream tarballs directly. + +Due to X.org being highly modular, packaging all X.org applications +as their own independent packages would have created too many Debian +packages. For this reason, some X.org applications have been grouped +into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils, +x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils. +Most packages, including the X.org server itself and all libraries +and drivers are, however maintained independently. + +The Debian packaging is added by creating the "debian-*" git branch +which contains the aforementioned "upstream-*" branch plus the debian/ +repository files. +When a patch has to be applied to the Debian package, two solutions +are involved: +* If the patch is available in one of the upstream branches, it + may be git'cherry-picked into the Debian repository. In this + case, it appears directly in the .diff.gz. +* Otherwise, the patch is added to debian/patches/ which is managed + with quilt as documented in /usr/share/doc/quilt/README.source. --- libxaw-1.0.12.orig/debian/changelog +++ libxaw-1.0.12/debian/changelog @@ -0,0 +1,314 @@ +libxaw (2:1.0.12-1) unstable; urgency=medium + + * New upstream release. + * Fix build with -Werror=format-security, and enable it. + * Remove Drew Parsons and Cyril Brulebois from Uploaders. + + -- Julien Cristau Mon, 20 Jan 2014 14:34:00 +0100 + +libxaw (2:1.0.11-1) unstable; urgency=low + + * New upstream release. + * Bump debhelper compat level to 7. + * Use dpkg-buildflags, disable -Werror=format-security since that causes + FTBFS. + * Disable silent rules. + * Remove ed from Build-Depends, no longer needed. + * Get rid of debian/xsfbs, use /usr/share/quilt/quilt.make for patch/unpatch + rules. + + -- Julien Cristau Sun, 16 Jun 2013 20:20:36 +0200 + +libxaw (2:1.0.10-2) unstable; urgency=low + + * *sigh* add missing Replaces/Breaks on libxaw7-dev for the new -doc + package. Some day I'll remember to add those the first time. + + -- Julien Cristau Wed, 11 Apr 2012 22:38:32 +0200 + +libxaw (2:1.0.10-1) unstable; urgency=low + + * New upstream release. + - Build fix for -Werror=pointer-to-int-cast (closes: #664934) + * Split documentation to a new libxaw-doc package. + * Fix up 01_Xaw_StripChart_fix.diff for new version. + * Don't require (fake)root for debian/rules clean. + * libxaw7-dev is now m-a: same, libxaw-doc m-a: foreign. + + -- Julien Cristau Wed, 11 Apr 2012 21:51:17 +0200 + +libxaw (2:1.0.9-3) unstable; urgency=low + + * Build for multiarch. + + -- Steve Langasek Fri, 21 Oct 2011 14:12:23 -0700 + +libxaw (2:1.0.9-2) unstable; urgency=low + + * Bump Standards-Version to 3.9.1. + * Drop Pre-Depends on x11-common, only needed for upgrades from sarge. + * Drop Conflicts/Replaces on libxaw6-dev, libxaw8-dev, libxaw-headers, last + shipped in etch. + * Remove David Nusinow and Brice Goglin from Uploaders. Thanks for your + work! + * Wrap debian/control Depends fields. + + -- Julien Cristau Sun, 06 Feb 2011 21:56:43 +0100 + +libxaw (2:1.0.9-1) experimental; urgency=low + + * New upstream release. + * Noticeable change: xaw6.pc now only has xmu in Requires.private, no + longer in Requires. Since it might trigger some FTBFS, target + experimental. Better be safe than sorry. + + -- Cyril Brulebois Wed, 12 Jan 2011 04:15:35 +0100 + +libxaw (2:1.0.8-2) unstable; urgency=low + + [ Julien Cristau ] + * Revert addition of libXaw.so to libxaw7.install, done by mistake in the + previous revision. That file belongs in the -dev package and is already + in libxaw7-dev.links (closes: #602620). Delete the link in debian/rules + install instead, to avoid dh_install complaints. + + [ Cyril Brulebois ] + * Lose the git push race, thank Alex Goebel for the report, and upload. + + -- Cyril Brulebois Sat, 06 Nov 2010 17:28:44 +0100 + +libxaw (2:1.0.8-1) unstable; urgency=low + + [ Julien Cristau ] + * Update debian/copyright from upstream COPYING. + * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no + good reason. Thanks, Colin Watson! + * Remove myself from Uploaders + + [ Cyril Brulebois ] + * New upstream release. + * Bump the build-dep on xutils-dev for new macros. + * Add myself to Uploaders. + * Remove --disable-xaw8, removed upstream between 1.0.4 and 1.0.5. + * Add xmlto, xorg-sgml-doctools, and w3m build-dep for the specs. + * Replace --enable-docs with --with-xmlto and --without-fop (we want + html and txt only). + * Kill *.xml in the doc directory, no point in shipping them. + * Switch from --list-missing to --fail-missing for additional safety. + * Add usr/lib/libXaw.so to libxaw7-dev.install, it wouldn't be installed + otherwise. + * Refresh patch. + + -- Cyril Brulebois Sat, 06 Nov 2010 13:01:42 +0100 + +libxaw (2:1.0.7-1) unstable; urgency=low + + [ Julien Cristau ] + * Add header to 01_Xaw_StripChart_fix.diff. This way it's not necessary to + go look at the changelog for xfree86 4.2.1-5 to figure out what this is + about. + * Build the Xaw spec and install it in libxaw7-dev. + * README.Debian pointed at this doc in xspecs, it's now unnecessary. + + [ Timo Aaltonen ] + * New upstream release. + * Bump the build-dep on xutils-dev (>= 1:7.5~1). + * Bump Standards-Version to 3.8.3. + + -- Julien Cristau Wed, 25 Nov 2009 13:47:36 +0100 + +libxaw (2:1.0.6-1) unstable; urgency=low + + * Add README.source, bump Standards-Version to 3.8.2. + * New upstream release. + * Move -dbg package to section debug. + + -- Brice Goglin Mon, 27 Jul 2009 17:37:25 +0200 + +libxaw (2:1.0.5-2) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Mon, 16 Feb 2009 19:11:19 +0100 + +libxaw (2:1.0.5-1) experimental; urgency=low + + [ Brice Goglin ] + * Add a link to www.X.org and a reference to the upstream module + in the long description. + + [ Timo Aaltonen ] + * New upstream release. + + [ Julien Cristau ] + * Run autoreconf on build. Add build-deps on autoconf, automake, libtool + and xutils-dev. + * Handle parallel builds. + + -- Julien Cristau Fri, 19 Dec 2008 14:11:04 +0100 + +libxaw (2:1.0.4-2) unstable; urgency=low + + [ Drew Parsons ] + * Add a README.Debian to libxaw7-dev, pointing to further + documentation in the xspecs package. Closes: #260659. + + [ Julien Cristau ] + * Stop building Xaw6. Remove the libxaw6, libxaw6-dbg, libxaw6-dev and + libxaw-headers packages, moving the contents of -headers to libxaw7-dev + (closes: #172890). + * Use ${binary:Version} instead of ${Source-Version}. + * Bump Standards-Version to 3.7.3. + * Add Vcs-Browser, and remove the XS- prefix from Vcs-Git. + * Drop the -1 debian revisions from build-dependencies. + * libxaw7{,-dbg} don't need to depend on x11-common. + * libxaw7-dev now Pre-Depends: x11-common (>= 1:7.0.0) because it contains + the Xaw headers in /usr/include/X11. + * Add myself to Uploaders. + + -- Julien Cristau Fri, 16 May 2008 16:02:12 +0200 + +libxaw (2:1.0.4-1) unstable; urgency=low + + [ Julien Cristau ] + * Move binary packages to the proper sections. + + [ Timo Aaltonen ] + * Bump the epoch so that this can be synced to Ubuntu in the future. + + [ Brice Goglin ] + * New upstream release. + * Add the upstream URL to debian/copyright. + * Add myself to Uploaders, and remove Fabio and Branden with their + permission. + + -- Brice Goglin Wed, 22 Aug 2007 09:22:34 +0200 + +libxaw (1:1.0.3-3) unstable; urgency=low + + * Upload to unstable. + + -- Julien Cristau Wed, 11 Apr 2007 11:09:19 +0200 + +libxaw (1:1.0.3-2) experimental; urgency=low + + * Ship the Xaw(3) manpage in libxaw-headers instead of libxaw7-dev. Bump + Replaces to libxaw7-dev (<< 1:1.0.3-2). + + -- Julien Cristau Fri, 16 Feb 2007 17:43:38 +0100 + +libxaw (1:1.0.3-1) experimental; urgency=low + + * New upstream release. + * Drop obsolete CVS info from the descriptions, and add XS-Vcs-Git. + * Install the upstream ChangeLog. + * Make libxaw binNMUable: build-dep on dpkg-dev >= 1.13.19, and change + dependency of libxaw?-dev to libxaw-headers (= ${source:Version}). + + -- Julien Cristau Fri, 9 Feb 2007 18:08:12 +0100 + +libxaw (1:1.0.2-4) unstable; urgency=low + + * Make libxaw7-dev conflict and replace libxaw6-dev and libxaw8-dev. Also + make libxaw6-dev do the same for libxaw7-dev and libxaw8-dev. These were + lost in the move to modular. + * Handle libXaw.so in *.links files so we can allow both libxaw6-dev and + libxaw7-dev to ship an appropriate libXaw.so symlink to libXaw[67].so + * Explicitly pass --disable-xaw8 to configure so that we don't try and build + it if the xprint .pc file is on the system. The configure script will try + and guess whether or not to build xaw8 if it doesn't get an explicit yes + or no. This way, we make sure the libXaw.so symlink doesn't get linked to + a non-existent libXaw8.so. Thanks Rene Engelhard, Steve Langasek, and + Michael Banck. + + -- David Nusinow Sun, 27 Aug 2006 19:17:18 +0000 + +libxaw (1:1.0.2-3) unstable; urgency=low + + * Bring X11R7.1 into unstable. + * dbg package has priority extra. + + -- Drew Parsons Sat, 26 Aug 2006 00:22:33 +1000 + +libxaw (1:1.0.2-2) experimental; urgency=low + + * Need to add libxaw7-dev.manpages for man pages to get installed! + + -- Drew Parsons Thu, 10 Aug 2006 00:51:43 +1000 + +libxaw (1:1.0.2-1) experimental; urgency=low + + * New upstream version (X11R7.1). + * Use debhelper 5, update control, compat, use of dh_install to match. + * Handle libXaw.so.[67] in .install instead of .links (for + consistency since other symlinks such as libXaw7.so.7 are already + handled there). + * Exclude .la and Xaw8 from dh_install. + * Install Xaw man page with libxaw7-dev. + + -- Drew Parsons Wed, 9 Aug 2006 22:38:21 +1000 + +libxaw (1:1.0.1-6) UNRELEASED; urgency=low + + * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build; + idempotency fix. + * Run dh_install w/ --list-missing. + * Bump standards version to 3.7.2.0. + * Version x11-common pre-dep in headers package to 1:7.0.0 to match + the rest of Debian. + + -- Andres Salomon Mon, 17 Jul 2006 01:20:41 -0400 + +libxaw (1:1.0.1-5) unstable; urgency=low + + * Reorder makeshlib command in rules file so that ldconfig is run + properly. Thanks Drew Parsons and Steve Langasek. + * Add quilt to build-depends + + -- David Nusinow Tue, 18 Apr 2006 22:48:53 -0400 + +libxaw (1:1.0.1-4) unstable; urgency=low + + * Upload to unstable + + -- David Nusinow Thu, 23 Mar 2006 22:44:29 -0500 + +libxaw (1:1.0.1-3) experimental; urgency=low + + * Fix typo in debian/rules that allowed libxaw7 to get stripped without + saving the debugging symbols in the right package + + -- David Nusinow Tue, 21 Mar 2006 20:43:38 -0500 + +libxaw (1:1.0.1-2) experimental; urgency=low + + * Port patches from trunk + + general/012_Xaw_StripChart_fix.diff + + -- David Nusinow Sun, 26 Feb 2006 19:09:55 -0500 + +libxaw (1:1.0.1-1) UNRLEASED; urgency=low + + * First upload to Debian + * Add ed to build-depends. Thanks Eugene Konev. (seriously... ed!) + + -- David Nusinow Fri, 6 Jan 2006 00:44:17 -0500 + +libxaw (7.0.2-3) breezy; urgency=low + + * Add libxmu-dev and libxpm-dev to the libxaw-headers dependencies.: + + -- Adam Conrad Mon, 25 Jul 2005 05:46:47 +0000 + +libxaw (7.0.2-2) breezy; urgency=low + + * Bump Build-Depends on libx11-dev, libxt-dev, libxmu-dev, libxpm-dev, and + x11proto-core-dev to avoid _XOPEN_SOURCE. + + -- Daniel Stone Sat, 23 Jul 2005 00:31:45 +1000 + +libxaw (7.0.2-1) breezy; urgency=low + + * First libxaw release. + + -- Daniel Stone Mon, 16 May 2005 22:10:17 +1000 --- libxaw-1.0.12.orig/debian/compat +++ libxaw-1.0.12/debian/compat @@ -0,0 +1 @@ +7 --- libxaw-1.0.12.orig/debian/control +++ libxaw-1.0.12/debian/control @@ -0,0 +1,115 @@ +Source: libxaw +Section: x11 +Priority: optional +Maintainer: Debian X Strike Force +Build-Depends: + debhelper (>= 7), + dpkg-dev (>= 1.16.0), + libx11-dev (>= 1:0.99.2), + x11proto-core-dev (>= 7.0.1), + libxt-dev (>= 1:0.99.1), + libxmu-dev (>= 1:0.99.1), + libxpm-dev (>= 1:3.5.3), + pkg-config, + quilt, + dpkg-dev (>= 1.13.19), + autoconf, + automake, + libtool, + xutils-dev (>= 1:7.5+4), +# specs: + xmlto, xorg-sgml-doctools (>= 1:1.5), w3m, +Standards-Version: 3.9.1 +Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxaw +Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxaw.git + +Package: libxaw7 +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, +Description: X11 Athena Widget library + libXaw7 provides the second version of Xaw, the Athena Widgets tookit, + which is largely used by legacy X applications. This version is the + most common version, as version 6 is considered deprecated, and version + 8, which adds Xprint support, is unsupported and not widely used. + In general, use of a more modern toolkit such as GTK+ is recommended. + . + More information about X.Org can be found at: + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXaw + +Package: libxaw7-dbg +Section: debug +Architecture: any +Multi-Arch: same +Priority: extra +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libxaw7 (= ${binary:Version}), +Description: X11 Athena Widget library (debug package) + libXaw7 provides the second version of Xaw, the Athena Widgets tookit, + which is largely used by legacy X applications. This version is the + most common version, as version 6 is considered deprecated, and version + 8, which adds Xprint support, is unsupported and not widely used. + In general, use of a more modern toolkit such as GTK+ is recommended. + . + This package contains the debug versions of the library found in libxaw7. + Non-developers likely have little use for this package. + . + More information about X.Org can be found at: + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXaw + +Package: libxaw7-dev +Section: libdevel +Architecture: any +Multi-Arch: same +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libxaw7 (= ${binary:Version}), + libx11-dev, + libxmu-dev, + libxpm-dev, + x11proto-core-dev, +Suggests: + libxaw-doc, +Description: X11 Athena Widget library (development headers) + libXaw7 provides the second version of Xaw, the Athena Widgets tookit, + which is largely used by legacy X applications. This version is the + most common version, as version 6 is considered deprecated, and version + 8, which adds Xprint support, is unsupported and not widely used. + In general, use of a more modern toolkit such as GTK+ is recommended. + . + This package contains the development headers for the library found in + libxaw7. Non-developers likely have little use for this package. + . + More information about X.Org can be found at: + + . + This module can be found at + git://anongit.freedesktop.org/git/xorg/lib/libXaw + +Package: libxaw-doc +Section: doc +Architecture: all +Multi-Arch: foreign +Depends: + ${misc:Depends}, +Breaks: + libxaw7-dev (<< 2:1.0.10), +Replaces: + libxaw7-dev (<< 2:1.0.10), +Description: X11 Athena Widget library (documentation) + Xaw, the Athena Widgets tookit, is largely used by legacy X applications. + . + This package contains the documentation for the Xaw library. --- libxaw-1.0.12.orig/debian/copyright +++ libxaw-1.0.12/debian/copyright @@ -0,0 +1,172 @@ +This package was downloaded from +http://xorg.freedesktop.org/releases/individual/lib/ + +Copyright 1985-1990, 1994, 1998 The Open Group +Copyright 2003-2004 Roland Mainz + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + + +Copyright (c) 1998-1999 by The XFree86 Project, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Except as contained in this notice, the name of the XFree86 Project shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from the +XFree86 Project. + + +Copyright 1991 by OMRON Corporation + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of OMRON not be used in advertising or +publicity pertaining to distribution of the software without specific, +written prior permission. OMRON makes no representations about the +suitability of this software for any purpose. It is provided "as is" +without express or implied warranty. + +OMRON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +OMRON BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 1987-1998 by Digital Equipment Corporation, Maynard, Massachusetts. +All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + +Copyright 1989 Prentice Hall + +Permission to use, copy, modify, and distribute this software for any +purpose and without fee is hereby granted, provided that the above +copyright notice appear in all copies and that both the copyright notice +and this permission notice appear in supporting documentation. + +Prentice Hall and the authors disclaim all warranties with regard +to this software, including all implied warranties of merchantability and +fitness. In no event shall Prentice Hall or the authors be liable +for any special, indirect or cosequential damages or any damages whatsoever +resulting from loss of use, data or profits, whether in an action of +contract, negligence or other tortious action, arising out of or in +connection with the use or performance of this software. + + +(c) Copyright 2003 Danny Backx +(c) Copyright 2003-2004 Roland Mainz + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the names of the copyright holders shall +not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from said +copyright holders. + + + +Copyright 1985, 1986, 1987, 1988, 1989, 1991, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the ``Software''), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +Copyright 1985, 1986, 1987, 1988, 1989, 1991 +Digital Equipment Corporation, Maynard, Massachusetts. + +Permission to use, copy, modify and distribute this documentation for any +purpose and without fee is hereby granted, provided that the above copyright +notice appears in all copies and that both that copyright notice and this +permission notice appear in supporting documentation, and that the name of +Digital not be used in in advertising or publicity pertaining +to distribution of the software without specific, written prior permission. +Digital makes no representations about the suitability of the +software described herein for any purpose. +It is provided ``as is'' without express or implied warranty. --- libxaw-1.0.12.orig/debian/libxaw-doc.install +++ libxaw-1.0.12/debian/libxaw-doc.install @@ -0,0 +1 @@ +usr/share/doc/libxaw7-dev --- libxaw-1.0.12.orig/debian/libxaw7-dev.install +++ libxaw-1.0.12/debian/libxaw7-dev.install @@ -0,0 +1,6 @@ +usr/lib/*/libXaw7.a +usr/lib/*/libXaw7.so +usr/lib/*/libXaw.so +usr/lib/*/pkgconfig/xaw7.pc +usr/include/X11/* +usr/share/man/man3/* --- libxaw-1.0.12.orig/debian/libxaw7.install +++ libxaw-1.0.12/debian/libxaw7.install @@ -0,0 +1,2 @@ +usr/lib/*/libXaw7.so.7* +usr/lib/*/libXaw.so.7 --- libxaw-1.0.12.orig/debian/patches/01_Xaw_StripChart_fix.diff +++ libxaw-1.0.12/debian/patches/01_Xaw_StripChart_fix.diff @@ -0,0 +1,100 @@ +From: "Nikita V. Youshchenko" +Date: Sat, 02 Nov 2002 17:57:13 +0300 +Subject: A bug in Xaw/StripChart.c causes incorrect scale lines in xload window + +Recently I tried to run xload on a high loaded server (load was more +than 10), and discovered that if window size is rather small, scale +lines are drawn incorrectly (upper than needed). + +This is caused by a bug in Xaw/StripChart.c. +It draws lines with fixed integer steps. Than means that if window +height is 39 pixels, and 10 lines should be drawn to split view into 11 +equal parts, lines will be drawn at 3, 6, 9, ,.., 30. So the bottom part +height will be 9 pixels while other parts height will be 2 pixels. + +This patch makes part heights differ no more than by 1 pixel. + +Debian bug#167448 + +--- a/src/StripChart.c ++++ b/src/StripChart.c +@@ -370,12 +370,12 @@ draw_it(XtPointer client_data, XtInterva + * the returned value is identical to the initial value of next and data is + * unchanged. Otherwise keeps half a window's worth of data. If data is + * changed, then w->strip_chart.max_value is updated to reflect the +- * largest data point ++ * largest data point. + */ +-static int ++static int + repaint_window(StripChartWidget w, int left, int width) + { +- int i, j; ++ int i, j, k; + int next = w->strip_chart.interval; + int scale = w->strip_chart.scale; + int scalewidth = 0; +@@ -420,8 +420,10 @@ repaint_window(StripChartWidget w, int l + } + + /* Draw graph reference lines */ ++ k = XtHeight(w) % w->strip_chart.scale; + for (i = 1; i < w->strip_chart.scale; i++) { +- j = i * ((int)XtHeight(w) / w->strip_chart.scale); ++ j = i * (XtHeight(w) / w->strip_chart.scale) + ++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale); + XDrawLine(dpy, win, w->strip_chart.hiGC, left, j, scalewidth, j); + } + } +@@ -443,7 +445,7 @@ static void + MoveChart(StripChartWidget w, Bool blit) + { + double old_max; +- int left, i, j; ++ int left, i, j, k; + int next = w->strip_chart.interval; + + if (!XtIsRealized((Widget)w)) +@@ -492,8 +494,10 @@ MoveChart(StripChartWidget w, Bool blit) + + /* Draw graph reference lines */ + left = j; ++ k = XtHeight(w) % w->strip_chart.scale; + for (i = 1; i < w->strip_chart.scale; i++) { +- j = i * (XtHeight(w) / w->strip_chart.scale); ++ j = i * (XtHeight(w) / w->strip_chart.scale) + ++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale); + XDrawLine(XtDisplay((Widget)w), XtWindow((Widget)w), + w->strip_chart.hiGC, left, j, XtWidth(w), j); + } +@@ -554,23 +558,26 @@ XawStripChartResize(Widget widget) + StripChartWidget w = (StripChartWidget)widget; + XPoint *points; + Cardinal size; +- int i; ++ int i, k; + + if (w->strip_chart.scale <= 1) { + XtFree((char *)w->strip_chart.points); + w->strip_chart.points = NULL; + return; + } +- ++ + size = sizeof(XPoint) * (w->strip_chart.scale - 1); + + points = (XPoint *)XtRealloc((XtPointer)w->strip_chart.points, size); + w->strip_chart.points = points; + + /* Draw graph reference lines into clip mask */ +- ++ k = XtHeight(w) % w->strip_chart.scale; + for (i = 1; i < w->strip_chart.scale; i++) { + points[i - 1].x = 0; +- points[i - 1].y = XtHeight(w) / w->strip_chart.scale; ++ points[i - 1].y = i * (XtHeight(w) / w->strip_chart.scale) + ++ ((i * k + w->strip_chart.scale/2) / w->strip_chart.scale); + } ++ for (i = w->strip_chart.scale - 1; i > 1; i--) ++ points[i - 1].y -= points[i - 2].y; + } --- libxaw-1.0.12.orig/debian/patches/series +++ libxaw-1.0.12/debian/patches/series @@ -0,0 +1 @@ +01_Xaw_StripChart_fix.diff --- libxaw-1.0.12.orig/debian/rules +++ libxaw-1.0.12/debian/rules @@ -0,0 +1,117 @@ +#!/usr/bin/make -f +# debian/rules for the Debian libxaw package. +# Copyright © 2004 Scott James Remnant +# Copyright © 2005 Daniel Stone +# Copyright © 2005 David Nusinow + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif +confflags += $(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=configure) + +configure: $(QUILT_STAMPFN) + autoreconf -vfi + +build: build-indep +build-indep: docflags = --enable-specs +build-indep: build-stamp +build-arch: docflags = --disable-specs +build-arch: build-stamp + +build-stamp: configure + dh_testdir + mkdir -p build + cd build && \ + ../configure --prefix=/usr --mandir=\$${prefix}/share/man \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + --infodir=\$${prefix}/share/info \ + --docdir=\$${datadir}/doc/libxaw7-dev \ + --disable-xaw6 \ + --with-xmlto --without-fop \ + --disable-silent-rules \ + $(confflags) \ + $(docflags) + + cd build && $(MAKE) + >$@ + +clean: unpatch + dh_testdir + rm -f build-stamp + rm -f config.cache config.log config.status + rm -f */config.cache */config.log */config.status + rm -f conftest* */conftest* + rm -rf autom4te.cache */autom4te.cache + rm -rf build + find -name Makefile.in -delete + rm -f compile config.guess config.sub configure depcomp install-sh + rm -f ltmain.sh missing INSTALL aclocal.m4 mkinstalldirs config.h.in + dh_clean + +install: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install + rm -f debian/tmp/usr/lib/*/libXaw.so + ln -s libXaw7.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libXaw.so + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir + dh_testroot + dh_installdocs -s + dh_install -s --fail-missing --exclude=.la + dh_installman -s + dh_installchangelogs -s + dh_link -s + dh_strip -s -Nlibxaw7 + dh_strip -plibxaw7 --dbg-package=libxaw7-dbg + dh_compress -s + dh_fixperms -s + dh_makeshlibs -s + dh_shlibdeps -s + dh_installdeb -s + dh_gencontrol -s + dh_md5sums -s + dh_builddeb -s + +# Build architecture-independent files here. +binary-indep: install + dh_testdir + dh_testroot + dh_installdocs -i + dh_install -i --fail-missing --exclude=.la + dh_installman -i + dh_installchangelogs -i + dh_link -i + dh_compress -i -X.xml + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i +# Nothing to do + +binary: binary-indep binary-arch +.PHONY: build build-indep build-arch +.PHONY: clean binary-indep binary-arch binary install --- libxaw-1.0.12.orig/debian/watch +++ libxaw-1.0.12/debian/watch @@ -0,0 +1,3 @@ +#git=git://anongit.freedesktop.org/xorg/lib/libXaw +version=3 +http://xorg.freedesktop.org/releases/individual/lib/ libXaw-(.*)\.tar\.gz --- libxaw-1.0.12.orig/src/DisplayList.c +++ libxaw-1.0.12/src/DisplayList.c @@ -287,7 +287,7 @@ } if (fp) { - snprintf(cname, fp - fname + 1, fname); + snprintf(cname, fp - fname + 1, "%s", fname); memmove(fname, fp + 1, strlen(fp)); lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc; if (!lc)