tags 560568 patch
thanks
The following is the patch from Ubuntu with one modification: autopoint
replaces cvs as build dependency (Ubuntu doesn't have autopoint package
yet).
https://launchpad.net/ubuntu/+source/gsetroot/1.1-2.1ubuntu1
diff -u gsetroot-1.1/debian/rules gsetroot-1.1/debian/rules
--- gsetroot-1.1/debian/rules
+++ gsetroot-1.1/debian/rules
@@ -25,10 +25,7 @@
endif
config.status:
- aclocal
- #autoheader
- automake-1.9 --add-missing --copy -i
- autoconf -v
+ autoreconf -vfi
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info
diff -u gsetroot-1.1/debian/control gsetroot-1.1/debian/control
--- gsetroot-1.1/debian/control
+++ gsetroot-1.1/debian/control
@@ -2,7 +2,7 @@
Section: x11
Priority: extra
Maintainer: Anibal Avelar <aave...@cofradia.org>
-Build-Depends: debhelper (>= 5), automake1.9, autoconf, libtool,
autotools-dev, pkg-config, libgtk2.0-dev, gettext (>= 0.15), dpatch
+Build-Depends: debhelper (>= 5), automake, autoconf, libtool, autotools-dev,
pkg-config, libgtk2.0-dev, gettext (>= 0.15), dpatch, autopoint
Homepage: http://gsetroot.sourceforge.net
Standards-Version: 3.7.3
diff -u gsetroot-1.1/debian/patches/00list gsetroot-1.1/debian/patches/00list
--- gsetroot-1.1/debian/patches/00list
+++ gsetroot-1.1/debian/patches/00list
@@ -1,0 +2 @@
+macro_dir
only in patch2:
unchanged:
--- gsetroot-1.1.orig/debian/patches/macro_dir.dpatch
+++ gsetroot-1.1/debian/patches/macro_dir.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## macro_dir.dpatch by Ilya Barygin <bary...@gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add macros/options to configure.in and Makefile.am for smooth running
+## DP: of autoreconf.
+
+...@dpatch@
+diff -urNad gsetroot-1.1~/Makefile.am gsetroot-1.1/Makefile.am
+--- gsetroot-1.1~/Makefile.am 2010-03-08 10:46:11.000000000 +0300
++++ gsetroot-1.1/Makefile.am 2010-03-08 10:47:03.000000000 +0300
+@@ -4,6 +4,7 @@
+ ## Please disable it in the Anjuta project configuration
+
+ SUBDIRS = intl po src
++ACLOCAL_AMFLAGS = -I m4
+
+ gsetrootdocdir = ${prefix}/doc/gsetroot
+ gsetrootdoc_DATA = \
+diff -urNad gsetroot-1.1~/configure.in gsetroot-1.1/configure.in
+--- gsetroot-1.1~/configure.in 2010-03-08 10:46:11.000000000 +0300
++++ gsetroot-1.1/configure.in 2010-03-08 10:47:03.000000000 +0300
+@@ -8,6 +8,9 @@
+ AM_INIT_AUTOMAKE(gsetroot, 1.1)
+ AC_CONFIG_HEADERS([config.h])
+
++AC_USE_SYSTEM_EXTENSIONS
++AC_CONFIG_MACRO_DIR([m4])
++
+ AC_ISC_POSIX
+ CFLAGS=""
+ AC_SUBST(CFLAGS)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
