Hello Josh and Release Team, maintainer of htop here.
On 2012-08-31 21:49, Adam D. Barratt wrote:
> On Wed, 2012-08-08 at 01:55 +0200, Cyril Brulebois wrote:
> > Josh Triplett <j...@joshtriplett.org> (30/07/2012):
> > > +--- trunk/Settings.c 2012/02/17 13:45:58 285
> > > ++++ trunk/Settings.c 2012/03/05 11:12:58 286
> > > +@@ -239,7 +239,9 @@
> > > + mkdir(htopDir, 0700);
> > > + free(htopDir);
> > > + free(configDir);
> > > +- if (access(legacyDotfile, R_OK) != 0) {
> > > ++ struct stat st;
> > > ++ lstat(legacyDotfile, &st);
> >
> > No error checking here…
> >
> > RETURN VALUE
> > On success, zero is returned. On error, -1 is returned, and errno
> > is
> > set appropriately.
> >
> > What does S_ISLNK() do when an error was reached?
> >
> > Surely that could be improved?
>
> Ping?
So I/we got the problem. I uploaded 1.0.1-2 after Josh said it should be
fine by Release Team. Some timer after I uploaded -3 and -4 to fix the
bug #685670.
Then I now come to ask for the unblock for -4 and see that -2 is not
really get through.
The upstream patch in question isn't perfect but the whole htop source
isn't either. Can I still please ask for unblock for -2 as a part of
asking to unblock -4?
--
Eugene V. Lyubimkin aka JackYF, JID: jackyf.devel(maildog)gmail.com
C++ GNU/Linux userspace developer, Debian Developer
diff -Nru htop-1.0.1/debian/changelog htop-1.0.1/debian/changelog
--- htop-1.0.1/debian/changelog 2012-07-30 19:12:19.000000000 +0300
+++ htop-1.0.1/debian/changelog 2012-09-17 20:45:12.000000000 +0300
@@ -1,3 +1,22 @@
+htop (1.0.1-4) unstable; urgency=low
+
+ * debian/rules:
+ - Retrieve and pass also CPPFLAGS and LDFLAGS. Patch by Simon Ruderich.
+ (Closes: #685670)
+
+ -- Eugene V. Lyubimkin <jac...@debian.org> Sat, 01 Sep 2012 14:29:59 +0300
+
+htop (1.0.1-3) unstable; urgency=low
+
+ * debian/rules:
+ - Retrieve CFLAGS from dpkg-buildflags as dpkg-buildpackage stopped to
+ export them. Thanks to Felix Geyer and Cyril Brulebois.
+ (Closes: #685670)
+ * debian/control:
+ - Build-depend on dpkg (>= 1.16.1) for using dpkg-buildflags.
+
+ -- Eugene V. Lyubimkin <jac...@debian.org> Mon, 27 Aug 2012 19:51:54 +0300
+
htop (1.0.1-2) unstable; urgency=low
* debian/patches:
diff -Nru htop-1.0.1/debian/control htop-1.0.1/debian/control
--- htop-1.0.1/debian/control 2011-11-26 15:23:26.000000000 +0200
+++ htop-1.0.1/debian/control 2012-09-17 20:45:12.000000000 +0300
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Eugene V. Lyubimkin <jac...@debian.org>
Build-Depends: debhelper (>= 7), libncurses5-dev, libncursesw5-dev,
- autotools-dev, quilt (>= 0.40), python-minimal, libhwloc-dev [!linux-any]
+ autotools-dev, quilt (>= 0.40), python-minimal, libhwloc-dev [!linux-any],
+ dpkg-dev (>= 1.16.1)
Standards-Version: 3.9.2
Homepage: http://htop.sourceforge.net
diff -Nru htop-1.0.1/debian/rules htop-1.0.1/debian/rules
--- htop-1.0.1/debian/rules 2011-11-26 15:15:42.000000000 +0200
+++ htop-1.0.1/debian/rules 2012-09-17 20:45:12.000000000 +0300
@@ -16,6 +16,10 @@
ARCH_DEPENDENT_CONFIGURE_PARAMS = --enable-hwloc
endif
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+
config.status: configure $(QUILT_STAMPFN)
dh_testdir
@@ -29,7 +33,7 @@
[ ! -r /usr/share/misc/config.guess ] || \
cp -f /usr/share/misc/config.guess config.guess
- CFLAGS="$(CFLAGS)" LDFLAGS="$(INSTALL_PROGRAM)" ./configure \
+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS) $(INSTALL_PROGRAM)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
