--- Begin Message ---
Package: sawfish
Version: 1:1.11.90-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for sawfish (versioned as 1:1.11.90-1.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru sawfish-1.11.90/debian/changelog sawfish-1.11.90/debian/changelog
--- sawfish-1.11.90/debian/changelog 2016-04-24 19:09:19.000000000 +0200
+++ sawfish-1.11.90/debian/changelog 2018-01-15 13:27:25.000000000 +0100
@@ -1,3 +1,16 @@
+sawfish (1:1.11.90-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/control: Drop build-dependency against libesd0-dev (Closes:
+ #856089)
+ * debian/control: Drop build-dependency against libaudiofile-dev (Closes:
+ #857673)
+ * debian/patches/make-build-reproducible: Fix files order in tarballs
+ (Closes: #820668)
+ * Fix FTCBFS: cross.patch (Closes: #864624)
+
+ -- Laurent Bigonville <[email protected]> Mon, 15 Jan 2018 13:27:25 +0100
+
sawfish (1:1.11.90-1) unstable; urgency=low
* New upstream release.
diff -Nru sawfish-1.11.90/debian/control sawfish-1.11.90/debian/control
--- sawfish-1.11.90/debian/control 2016-04-24 19:09:19.000000000 +0200
+++ sawfish-1.11.90/debian/control 2018-01-15 11:34:58.000000000 +0100
@@ -9,8 +9,6 @@
debhelper (>= 9.0.0),
dh-autoreconf,
gettext (>= 0.10.37),
- libaudiofile-dev,
- libesd0-dev,
libgmp-dev | libgmp3-dev (>= 4.1.4-8),
libgtk2.0-dev (>= 2.6),
librep-dev (>= 0.92.5),
diff -Nru sawfish-1.11.90/debian/patches/cross.patch
sawfish-1.11.90/debian/patches/cross.patch
--- sawfish-1.11.90/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ sawfish-1.11.90/debian/patches/cross.patch 2018-01-15 13:27:07.000000000
+0100
@@ -0,0 +1,123 @@
+From: Helmut Grohne <[email protected]>
+Subject: use a triplet-prefixed pkg-config for cross compilation
+
+Index: sawfish-1.11.90/configure.in
+===================================================================
+--- sawfish-1.11.90.orig/configure.in
++++ sawfish-1.11.90/configure.in
+@@ -59,7 +59,7 @@
+ AC_HEADER_SYS_WAIT
+ AC_HEADER_TIME
+ AC_CHECK_HEADERS(fcntl.h sys/time.h sys/utsname.h)
+-AC_PATH_PROG(PKG_CONFIG, [pkg-config], [no])
++PKG_PROG_PKG_CONFIG
+
+ dnl Check for X headers, etc
+ _cppflags="${CPPFLAGS}"
+@@ -97,7 +97,7 @@
+
+ PKG_CHECK_MODULES(libXft, xft >= 1.0
+ ,XFT_LIBS="-lXft"
+- XFT_CFLAGS="`pkg-config --cflags xft`"
++ XFT_CFLAGS="`$PKG_CONFIG --cflags xft`"
+ AC_DEFINE(HAVE_X11_XFT_XFT_H, 1, [Have xft])
+ ,AC_MSG_ERROR([cannot locate libXft]))
+
+@@ -106,8 +106,8 @@
+
+ PKG_CHECK_MODULES(libX11, x11 >= 1.0
+ ,AC_DEFINE(HAVE_X11, 1, [Have X11])
+- X_LIBS="`pkg-config --libs x11`"
+- X_CFLAGS="`pkg-config --cflags x11`"
++ X_LIBS="`$PKG_CONFIG --libs x11`"
++ X_CFLAGS="`$PKG_CONFIG --cflags x11`"
+ AC_DEFINE(X_DISPLAY_MISSING, 0, [Have x11])
+ ,AC_MSG_ERROR([cannot locate libX11]))
+
+@@ -206,8 +206,8 @@
+ ,AC_DEFINE(HAVE_PANGO_XFT, 1, [Have pangoxft])
PANGO_MODULES="${PANGO_MODULES} pangoxft" have_pango_xft="yes"
FONT_LOADER="Pango XFT" AC_SUBST(have_pango_xft)
+ ,AC_MSG_WARN([pango xft support not available
$PANGO_MIN_VER]))
+
+-PANGO_LIBS=`pkg-config --libs $PANGO_MODULES`
+-PANGO_CFLAGS=`pkg-config --cflags $PANGO_MODULES`
++PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_MODULES`
++PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_MODULES`
+
+ else FONT_LOADER="X.Org"
+ fi
+@@ -216,11 +216,11 @@
+ REP_MIN_VER="0.92.3"
+
+ PKG_CHECK_MODULES(LIBREP, librep >= ${REP_MIN_VER}
+- ,REP_EXECDIR="`pkg-config --variable=repcommonexecdir librep`"
+- REP_CFLAGS="`pkg-config --cflags librep`"
+- REP_LIBS="`pkg-config --libs librep`"
++ ,REP_EXECDIR="`$PKG_CONFIG --variable=repcommonexecdir
librep`"
++ REP_CFLAGS="`$PKG_CONFIG --cflags librep`"
++ REP_LIBS="`$PKG_CONFIG --libs librep`"
+ REP_MSGFMT="`which msgfmt`"
+- REP_VERSION="`pkg-config --variable=version librep`"
++ REP_VERSION="`$PKG_CONFIG --variable=version librep`"
+ ,AC_MSG_ERROR([cannot locate librep >= $REP_MIN_VER]))
+
+ dnl Check for rep-gtk
+@@ -235,8 +235,8 @@
+ GDK_MIN_VER="2.23.0"
+
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= ${GTK_MIN_VER}
+- ,GTK_LIBS="`pkg-config --libs gtk+-2.0`"
+- GTK_CFLAGS="`pkg-config --cflags gtk+-2.0`"
++ ,GTK_LIBS="`$PKG_CONFIG --libs gtk+-2.0`"
++ GTK_CFLAGS="`$PKG_CONFIG --cflags gtk+-2.0`"
+ AC_DEFINE(HAVE_GTK, 1, [Have GTK])
+ ,AC_MSG_ERROR([cannot locate gtk+ >= $GTK_MIN_VER]))
+
+@@ -247,8 +247,8 @@
+
+ if test "$with_gdk_pixbuf" != "no"; then
+ PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-xlib-2.0 >= ${GDK_MIN_VER}
+- ,IMAGE_CFLAGS="`pkg-config --cflags
gdk-pixbuf-xlib-2.0`"
+- IMAGE_LIBS="`pkg-config --libs gdk-pixbuf-xlib-2.0`"
++ ,IMAGE_CFLAGS="`$PKG_CONFIG --cflags
gdk-pixbuf-xlib-2.0`"
++ IMAGE_LIBS="`$PKG_CONFIG --libs gdk-pixbuf-xlib-2.0`"
+ IMAGE_PC="gdk-pixbuf-xlib-2.0 >= ${GDK_MIN_VER}"
+ AC_DEFINE(HAVE_GDK_PIXBUF, 1, [Have gdk-pixbuf])
+ AC_DEFINE(NEED_PIXMAP_CACHE, 1, [Need pixmap cache])
+@@ -261,11 +261,11 @@
+
+ if test "$with_gdk_pixbuf" = "no"; then
+ PKG_CHECK_MODULES(IMLIB1, imlib >= 1.9
+- ,IMAGE_CFLAGS="-I`pkg-config --variable includedir
imlib`"
+- IMAGE_LIBS="`pkg-config --libs imlib`"
++ ,IMAGE_CFLAGS="-I`$PKG_CONFIG --variable includedir
imlib`"
++ IMAGE_LIBS="`$PKG_CONFIG --libs imlib`"
+ IMAGE_PC="imlib >= 1.9"
+ AC_DEFINE(HAVE_IMLIB, 1, [Have Imlib1])
+- IMLIB_VERSION="`pkg-config --modversion imlib`"
++ IMLIB_VERSION="`$PKG_CONFIG --modversion imlib`"
+ IMAGE_LOADER="IMLIB 1"
+ imageloader="imlib1"
+ ,AC_MSG_ERROR([cannot locate imlib1 library]))
+@@ -462,16 +462,16 @@
+ mv data/sawfish.ebuild sawfish-$version.ebuild
+ mv data/sawfish.spec sawfish.spec
+
+-REP_VERSION="`pkg-config --modversion librep`"
+-REP_GTK_VERSION="`pkg-config --modversion rep-gtk`"
+-GLIB_VERSION="`pkg-config --modversion glib-2.0`"
+-PANGO_VERSION="`pkg-config --modversion pango`"
++REP_VERSION="`$PKG_CONFIG --modversion librep`"
++REP_GTK_VERSION="`$PKG_CONFIG --modversion rep-gtk`"
++GLIB_VERSION="`$PKG_CONFIG --modversion glib-2.0`"
++PANGO_VERSION="`$PKG_CONFIG --modversion pango`"
+
+ if $PKG_CONFIG --exists cairo; then
+- CAIRO_VERSION="`pkg-config --modversion cairo`"
++ CAIRO_VERSION="`$PKG_CONFIG --modversion cairo`"
+ fi
+
+-GTK_VERSION="`pkg-config --modversion gtk+-2.0`"
++GTK_VERSION="`$PKG_CONFIG --modversion gtk+-2.0`"
+
+ echo "
+ == == == == == == == == == == == == ==
diff -Nru sawfish-1.11.90/debian/patches/make-build-reproducible
sawfish-1.11.90/debian/patches/make-build-reproducible
--- sawfish-1.11.90/debian/patches/make-build-reproducible 2016-04-24
16:01:50.000000000 +0200
+++ sawfish-1.11.90/debian/patches/make-build-reproducible 2018-01-15
13:15:06.000000000 +0100
@@ -10,7 +10,7 @@
for f in $(srcdir)/$$d/*; do \
if [ $$f != $(srcdir)/$$d/CVS ]; then \
- ( cd $(srcdir) && tar czf $$d.tar.gz $$d/* ) ; \
-+ ( cd $(srcdir) && LC_ALL=C GZIP=-9n tar czf $$d.tar.gz $$d/* ) ; \
++ ( cd $(srcdir) && GZIP=-9n tar --sort=name -czf $$d.tar.gz
`LC_ALL=C ls -d $$d/*` ) ; \
$(INSTALL_DATA) $$d.tar.gz $(DESTDIR)$(themedir)/$$d.tar.gz; \
fi \
done \
diff -Nru sawfish-1.11.90/debian/patches/series
sawfish-1.11.90/debian/patches/series
--- sawfish-1.11.90/debian/patches/series 2016-04-24 16:01:50.000000000
+0200
+++ sawfish-1.11.90/debian/patches/series 2018-01-15 13:27:07.000000000
+0100
@@ -6,3 +6,4 @@
fix-desktop-entry-lacks-keywords-entry
dont_remove_wallpaper_jlc.patch
010_honours_SOURCE_DATE_EPOCH_for_build_h
+cross.patch
--- End Message ---
