configure.ac | 2 +- debian/changelog | 12 ++++++++++-- debian/rules | 3 ++- sxpm/Makefile.am | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-)
New commits: commit 47bd71042f7bd562a4a855f1dc6c53e29d326e78 Author: Julien Cristau <jcris...@debian.org> Date: Mon Oct 31 18:18:25 2011 +0100 Clean up libtool m4 files. diff --git a/debian/changelog b/debian/changelog index 56d56c3..dda98e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxpm (1:3.5.9-5) UNRELEASED; urgency=low + + * Clean up libtool m4 files. + + -- Julien Cristau <jcris...@debian.org> Mon, 31 Oct 2011 18:18:12 +0100 + libxpm (1:3.5.9-4) unstable; urgency=low * Exclude xpmutils from the debug package so it really is multi-arch safe diff --git a/debian/rules b/debian/rules index fbc0a33..06b37ee 100755 --- a/debian/rules +++ b/debian/rules @@ -61,7 +61,8 @@ clean: rm -rf build rm -f aclocal.m4 compile config.guess config.h.in config.sub configure rm -f INSTALL depcomp install-sh ltmain.sh missing mkinstalldirs - rm -f $$(find -name Makefile.in) + find -name Makefile.in -delete + rm -f m4/libtool*.m4 m4/lt*.m4 # Extra clean-up: rm -f doc/xpm.pdf commit 162c907c421bbd793a8278e24b25e61d3e83502a Author: Julien Cristau <jcris...@debian.org> Date: Mon Oct 31 16:41:59 2011 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 04e956b..56d56c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ -libxpm (1:3.5.9-4) UNRELEASED; urgency=low +libxpm (1:3.5.9-4) unstable; urgency=low * Exclude xpmutils from the debug package so it really is multi-arch safe (closes: #646960). Thanks, Jakub Wilk! * Don't require fakeroot for debian/rules clean. + * Replace the change from 1:3.5.9-3 with the equivalent fix committed + upstream. - -- Julien Cristau <jcris...@debian.org> Sat, 29 Oct 2011 12:11:30 +0200 + -- Julien Cristau <jcris...@debian.org> Mon, 31 Oct 2011 16:41:44 +0100 libxpm (1:3.5.9-3) unstable; urgency=low commit 834f00597cddeea296646f1c0c0ac7f37a1afa47 Author: Julien Cristau <jcris...@debian.org> Date: Sat Sep 24 19:18:56 2011 +0200 Link sxpm against -lX11 It calls various Xlib functions so should link with -lX11 directly. Signed-off-by: Julien Cristau <jcris...@debian.org> (cherry picked from commit 29972ebbb2409bcba87637069a7ad9a958b3325d) diff --git a/configure.ac b/configure.ac index 057c056..376cca3 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CHECK_FUNCS([strlcat]) # Obtain compiler/linker options for dependencies PKG_CHECK_MODULES(XPM, xproto x11) -PKG_CHECK_MODULES(SXPM, xt xext xextproto, build_sxpm=true, build_sxpm=false) +PKG_CHECK_MODULES(SXPM, x11 xt xext xextproto, build_sxpm=true, build_sxpm=false) AM_CONDITIONAL(BUILD_SXPM, test x$build_sxpm = xtrue) # Internationalization & localization support commit 1fcb25d038b7a73ac52f88348e43349cb45154ec Author: Julien Cristau <jcris...@debian.org> Date: Mon Oct 31 16:38:55 2011 +0100 Revert sxpm/Makefile.am change from 1:3.5.9-3 diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am index dae968b..8241e87 100644 --- a/sxpm/Makefile.am +++ b/sxpm/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS = $(CWARNFLAGS) $(SXPM_CFLAGS) sxpm_SOURCES = sxpm.c -LDADD = $(top_builddir)/src/libXpm.la $(SXPM_LIBS) -lX11 +LDADD = $(SXPM_LIBS) $(top_builddir)/src/libXpm.la # Man page appmandir = $(APP_MAN_DIR) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rkvvq-0000ey...@vasks.debian.org