On Wed, Sep 06, 2006 at 12:04:39AM -0300, Damián Viano wrote:
> Package: gnome-lokkit
> Version: 0.50.22-6
> Followup-For: Bug #386072
>
> I successfully built gnome-lokkit with the attached, minimum, patch.
>
> diff -Nura gnome-lokkit-0.50.22/debian/rules
> /home/des/.pbuilder/build/7052/home/des/gnome-lokkit-0.50.22/debian/rules
> --- gnome-lokkit-0.50.22/debian/rules 2006-09-02 16:58:50.000000000 -0300
> +++ /home/des/.pbuilder/build/7052/home/des/gnome-lokkit-0.50.22/debian/rules
> 2006-09-02 17:09:48.000000000 -0300
> @@ -28,7 +28,7 @@
> # Rebootstrap the package
> aclocal -I macros
> autopoint -f
> - sed 's@/\*@/*|.*@' < po/Makefile.in.in > po/Makefile.in.bak
> + sed 's@/\*@/*|.*@;s/= @MKINSTALLDIRS@/= @install_sh@ -d/' <
> po/Makefile.in.in > po/Makefile.in.bak
> mv po/Makefile.in.bak po/Makefile.in.in
> libtoolize -f -c
> autoconf
As explained on debian-qa, I believe that this patch is wrong, since
aclocal fails before this command is run. Here is another patch.
Denis
diff -u gnome-lokkit-0.50.22/debian/changelog
gnome-lokkit-0.50.22/debian/changelog
--- gnome-lokkit-0.50.22/debian/changelog
+++ gnome-lokkit-0.50.22/debian/changelog
@@ -1,3 +1,10 @@
+gnome-lokkit (0.50.22-6.1) unstable; urgency=low
+
+ * Non maintainer upload
+ * Fix build failure with gettext 0.15. Closes: #386072
+
+ -- Denis Barbier <[EMAIL PROTECTED]> Tue, 12 Sep 2006 22:29:49 +0200
+
gnome-lokkit (0.50.22-6) unstable; urgency=low
* Rebuild with libnewt0.52.
diff -u gnome-lokkit-0.50.22/configure.in gnome-lokkit-0.50.22/configure.in
--- gnome-lokkit-0.50.22/configure.in
+++ gnome-lokkit-0.50.22/configure.in
@@ -20,7 +20,7 @@
ALL_LINGUAS="az ca da de el en_SE es fr gl hu it ja nl no pl pt pt_BR ro ru sk
sl sv tr uk zh_TW"
AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.10.40)
+AM_GNU_GETTEXT_VERSION(0.12.1)
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
diff -u gnome-lokkit-0.50.22/debian/rules gnome-lokkit-0.50.22/debian/rules
--- gnome-lokkit-0.50.22/debian/rules
+++ gnome-lokkit-0.50.22/debian/rules
@@ -26,14 +26,12 @@
dh_testdir
# Rebootstrap the package
- aclocal -I macros
autopoint -f
- sed 's@/\*@/*|.*@' < po/Makefile.in.in > po/Makefile.in.bak
- mv po/Makefile.in.bak po/Makefile.in.in
libtoolize -f -c
- autoconf
- automake -a -c
+ aclocal -I macros -I m4
autoheader
+ automake -a -c
+ autoconf
# Configure the package.
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
--- gnome-lokkit-0.50.22.orig/po/Makevars
+++ gnome-lokkit-0.50.22/po/Makevars
@@ -0,0 +1,8 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
