Hello!

I'm attaching a debdiff with NMU changes that I'm uploading to
delayed/10....

Regards,
Andreas Henriksson
diff -Nru distcc-3.1/debian/changelog distcc-3.1/debian/changelog
--- distcc-3.1/debian/changelog 2015-08-23 09:55:23.000000000 +0200
+++ distcc-3.1/debian/changelog 2017-10-19 13:05:18.000000000 +0200
@@ -1,3 +1,13 @@
+distcc (3.1-6.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop libgnomeui-dev build-dependency and switch configure flag
+    --with-gnome to --with-gtk. (Closes: #868389)
+  * Add debian/patches/08_gnome-data-public-dirs_fix_icon.patch
+    (Closes: #774608), thanks to Chow Loong Jin "hyperair".
+
+ -- Andreas Henriksson <andr...@fatal.se>  Thu, 19 Oct 2017 13:05:18 +0200
+
 distcc (3.1-6.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru distcc-3.1/debian/control distcc-3.1/debian/control
--- distcc-3.1/debian/control   2015-08-23 09:51:39.000000000 +0200
+++ distcc-3.1/debian/control   2017-10-19 12:49:12.000000000 +0200
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Daniel Hartwig <mand...@gmail.com>
-Build-Depends: debhelper (>= 9), libpopt-dev, linuxdoc-tools, autoconf, 
libgtk2.0-dev, libgnomeui-dev, po-debconf, python-dev, dh-python, autotools-dev
+Build-Depends: debhelper (>= 9), libpopt-dev, linuxdoc-tools, autoconf, 
libgtk2.0-dev, po-debconf, python-dev, dh-python, autotools-dev
 Standards-Version: 3.9.3
 Homepage: http://code.google.com/p/distcc/
 
diff -Nru distcc-3.1/debian/patches/08_gnome-data-public-dirs_fix_icon.patch 
distcc-3.1/debian/patches/08_gnome-data-public-dirs_fix_icon.patch
--- distcc-3.1/debian/patches/08_gnome-data-public-dirs_fix_icon.patch  
1970-01-01 01:00:00.000000000 +0100
+++ distcc-3.1/debian/patches/08_gnome-data-public-dirs_fix_icon.patch  
2017-10-19 13:05:18.000000000 +0200
@@ -0,0 +1,25 @@
+diff -u b/source/Makefile.in distcc-3.1/source/Makefile.in
+--- b/source/Makefile.in
++++ distcc-3.1/source/Makefile.in      2015-01-05 14:21:29.006455909 +0800
+@@ -55,7 +55,7 @@
+ 
+ # These must be done from here, not from autoconf, because they can 
+ # contain variable expansions written in Make syntax.  Ew.
+-DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\""
++DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" 
-DICONDIR="\"${icondir}\""
+ 
+ # arguments to pkgconfig
+ GNOME_PACKAGES = @GNOME_PACKAGES@
+only in patch2:
+unchanged:
+--- distcc-3.1.orig/source/src/mon-gnome.c     2015-01-05 12:16:21.000000000 
+0800
++++ distcc-3.1/source/src/mon-gnome.c  2015-01-05 14:15:01.417143103 +0800
+@@ -599,7 +599,7 @@
+ 
+ #if GTK_CHECK_VERSION(2,2,0)
+   gtk_window_set_icon_from_file (GTK_WINDOW (mainwin),
+-                                 PKGDATADIR "/distccmon-gnome-icon.png",
++                                 ICONDIR "/distccmon-gnome-icon.png",
+                                  NULL);
+ #endif
+ 
diff -Nru distcc-3.1/debian/patches/series distcc-3.1/debian/patches/series
--- distcc-3.1/debian/patches/series    2013-01-10 11:55:32.000000000 +0100
+++ distcc-3.1/debian/patches/series    2017-10-19 13:05:18.000000000 +0200
@@ -5,6 +5,7 @@
 06_set-pythonpath-securely.patch
 07_preferred-user.patch
 08_gnome-data-public-dirs.patch
+08_gnome-data-public-dirs_fix_icon.patch
 09_rename-pump.patch
 10_consecutive-preprocessor-options.patch
 11_lsdistcc-man.patch
diff -Nru distcc-3.1/debian/rules distcc-3.1/debian/rules
--- distcc-3.1/debian/rules     2015-08-23 09:53:27.000000000 +0200
+++ distcc-3.1/debian/rules     2017-10-19 12:47:48.000000000 +0200
@@ -19,7 +19,7 @@
 
 override_dh_auto_configure:
        dh_auto_configure -- \
-         --enable-rfc2553 --disable-Werror --with-gnome \
+         --enable-rfc2553 --disable-Werror --with-gtk \
          PYTHON=$(shell which `pyversions -d`)
 
        sed s/%DEB_HOST_MULTIARCH%/$(DEB_HOST_MULTIARCH)/ \

Reply via email to