Package: asmem Version: 1.9-2 Severity: normal Tags: patch As part of a bug squashing party to fix g++ transition issues ( http://lists.debian.org/debian-devel-announce/2005/09/msg00004.html ), I have made a non-maintainer upload of asmem. The diff between -2 and -2.1 is attached.
Hamish
reverted: --- asmem-1.9/debian/dirs +++ asmem-1.9.orig/debian/dirs @@ -1 +0,0 @@ -usr/bin reverted: --- asmem-1.9/debian/docs +++ asmem-1.9.orig/debian/docs @@ -1,2 +0,0 @@ -CHANGES -README diff -u asmem-1.9/debian/control asmem-1.9/debian/control --- asmem-1.9/debian/control +++ asmem-1.9/debian/control @@ -3,11 +3,11 @@ Priority: optional Maintainer: Alexander Kotelnikov <[EMAIL PROTECTED]> -Build-Depends: debhelper, xlibs-dev +Build-Depends: debhelper (>= 4), xlibs-dev Standards-Version: 3.5.6 Package: asmem Architecture: any Depends: ${shlibs:Depends} -Description: This is an AfterStep look & feel memory utilization monitor. +Description: memory utilization monitor with AfterStep look & feel asmem displays memory (user/system, buffer and cache) and swap usage in a small 54x54 X window. diff -u asmem-1.9/debian/rules asmem-1.9/debian/rules --- asmem-1.9/debian/rules +++ asmem-1.9/debian/rules @@ -6,7 +6,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatability version to use. -export DH_COMPAT=1 +export DH_COMPAT=4 configure: configure-stamp configure-stamp: @@ -44,9 +44,9 @@ dh_clean -k dh_installdirs - # Add here commands to install the package into debian/tmp. - #$(MAKE) install prefix=`pwd`/debian/tmp/usr - install -c -s -m 755 asmem `pwd`/debian/tmp/usr/bin + # Add here commands to install the package into debian/asmem. + #$(MAKE) install prefix=`pwd`/debian/asmem/usr + install -c -s -m 755 asmem `pwd`/debian/asmem/usr/bin # Build architecture-independent files here. @@ -58,7 +58,7 @@ dh_testdir dh_testroot dh_installdocs - dh_installmanpages + dh_installman asmem.1 dh_installchangelogs CHANGES dh_link dh_strip diff -u asmem-1.9/debian/changelog asmem-1.9/debian/changelog --- asmem-1.9/debian/changelog +++ asmem-1.9/debian/changelog @@ -1,3 +1,16 @@ +asmem (1.9-2.1) unstable; urgency=low + + * BSP NMU + * Fix FTBFS with gcc-4.0 due to label at end of switch statement + (read_mem.c). (Closes: bug#258460). Thanks to Andreas Jochens for + the patch. + * Use debhelper 4 + * Clean up lintian warnings: + * Fix copyright file and refer to GPL in /usr/share/common-licenses + * Fix short description + + -- Hamish Moffatt <[EMAIL PROTECTED]> Sat, 10 Sep 2005 10:44:45 +0000 + asmem (1.9-2) unstable; urgency=low * Build-Depends inserted in debian/control, closes: #146930 diff -u asmem-1.9/debian/copyright asmem-1.9/debian/copyright --- asmem-1.9/debian/copyright +++ asmem-1.9/debian/copyright @@ -6,7 +6,5 @@ -Upstream Author(s): Albert "Tigr" Dorofeev <[EMAIL PROTECTED]> +Copyright (c) 1998-2000 Albert Dorofeev <[EMAIL PROTECTED]> -Copyright: +This software is distributed under GPL. For details see +/usr/share/common-licenses/GPL. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 dated June, 1991. only in patch2: unchanged: --- asmem-1.9.orig/read_mem.c +++ asmem-1.9/read_mem.c @@ -482,7 +482,6 @@ case -1 : error_handle(2, "read"); return -1; - default : } buf[result-1] = 0; result = sscanf(buf, "%*[^\n]%*s %ld %ld %ld %ld %ld %ld\n%*s %ld %ld %ld", only in patch2: unchanged: --- asmem-1.9.orig/debian/asmem.docs +++ asmem-1.9/debian/asmem.docs @@ -0,0 +1,2 @@ +CHANGES +README only in patch2: unchanged: --- asmem-1.9.orig/debian/asmem.dirs +++ asmem-1.9/debian/asmem.dirs @@ -0,0 +1 @@ +usr/bin only in patch2: unchanged: --- asmem-1.9.orig/debian/substvars +++ asmem-1.9/debian/substvars @@ -0,0 +1 @@ +shlibs:Depends=libc6 (>= 2.3.5-1), libice6 | xlibs (>> 4.1.0), libjpeg62, libsm6 | xlibs (>> 4.1.0), libx11-6 | xlibs (>> 4.1.0), libxext6 | xlibs (>> 4.1.0), libxpm4 | xlibs (>> 4.1.0)