reverted: --- chemtool-1.6.12/Makefile.am +++ chemtool-1.6.12.orig/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@ # Link time dependencies. +LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ -LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@ -lX11 -lXext # Additional files to be distributed. EXTRA_DIST = autogen.sh autoclean.sh reverted: --- chemtool-1.6.12/Makefile.in +++ chemtool-1.6.12.orig/Makefile.in @@ -72,7 +72,7 @@ am_chemtool_OBJECTS = main.$(OBJEXT) draw.$(OBJEXT) graph.$(OBJEXT) \ chemproc.$(OBJEXT) undo.$(OBJEXT) inout.$(OBJEXT) chemtool_OBJECTS = $(am_chemtool_OBJECTS) +chemtool_LDADD = $(LDADD) -chemtool_LDADD = $(LDADD) -lX11 -lXext chemtool_DEPENDENCIES = src_cht_cht_SOURCES = src-cht/cht.c src_cht_cht_OBJECTS = cht.$(OBJEXT) diff -u chemtool-1.6.12/debian/control chemtool-1.6.12/debian/control --- chemtool-1.6.12/debian/control +++ chemtool-1.6.12/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Banck , LI Daobing , Daniel Leidert (dale) -Build-Depends: debhelper (>> 5), cdbs, autotools-dev, libgtk2.0-dev +Build-Depends: debhelper (>> 5), cdbs, autotools-dev, libgtk2.0-dev, quilt Standards-Version: 3.8.1 Homepage: http://ruby.chemie.uni-freiburg.de/~martin/chemtool/ Vcs-Browser: http://svn.debian.org/wsvn/debichem/ diff -u chemtool-1.6.12/debian/changelog chemtool-1.6.12/debian/changelog --- chemtool-1.6.12/debian/changelog +++ chemtool-1.6.12/debian/changelog @@ -1,3 +1,12 @@ +chemtool (1.6.12-1ubuntu1.11.04.1) natty; urgency=low + + * Cherry-pick bugfixes from Debian + - Fix gettext support initialization (LP: #839745) + * Move existing in-line changes to Makefile.in to a patch + * Add quilt patch system + + -- Marc Gariépy Wed, 07 Dec 2011 14:56:16 -0500 + chemtool (1.6.12-1ubuntu1) natty; urgency=low * Makefile.in, Makefile.am diff -u chemtool-1.6.12/debian/rules chemtool-1.6.12/debian/rules --- chemtool-1.6.12/debian/rules +++ chemtool-1.6.12/debian/rules @@ -5,6 +5,7 @@ include /usr/share/cdbs/1/rules/buildcore.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk DEB_MAKE_CHECK_TARGET = DEB_CONFIGURE_EXTRA_FLAGS := --without-gnomedir --without-kdedir only in patch2: unchanged: --- chemtool-1.6.12.orig/debian/patches/LP839745_enabling_translation.patch +++ chemtool-1.6.12/debian/patches/LP839745_enabling_translation.patch @@ -0,0 +1,111 @@ +Description: Make I18N work again +Author: Daniel Leidert +Bug-Ubuntu: http://bugs.launchpad.net/bugs/839745 +Forwarded: yes +Last-Update: 2011-11-26 + +--- a/gtkintl.h ++++ b/gtkintl.h +@@ -2,7 +2,7 @@ + #define __GTKINTL_H__ + + +-#ifndef DISABLE_NLS ++#ifdef ENABLE_NLS + #include + #if !defined _ + #define _(String) dgettext("gtk+",String) +--- a/inout.c ++++ b/inout.c +@@ -15,7 +15,7 @@ + #ifdef EMF + #include + #endif +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + #define _(Text) Text + #else + #include +--- a/main.c ++++ b/main.c +@@ -31,7 +31,7 @@ + #include + #include + #include "ct.h" +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + #define _(Text) Text + #else + #include +@@ -3303,7 +3303,7 @@ + "This should normally get installed in /usr/share/doc/packages/chemtool.\n" + "If you find any bugs or have a question or suggestion, please contact the\n" + "main author, martin@ruby.chemie.uni-freiburg.de"); +-#ifndef DISABLE_NLS ++#ifdef ENABLE_NLS + (void) gtk_set_locale (); /* newer glibc requires this */ + /* but we have to guard against locales that use a comma in numbers */ + (void) setlocale (LC_NUMERIC, "C"); +@@ -3469,7 +3469,7 @@ + gtk_text_view_set_editable(GTK_TEXT_VIEW(helptext), FALSE); + helptextbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(helptext)); + gtk_text_buffer_get_iter_at_offset (helptextbuffer, &ht_iter, 0); +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + gtk_text_buffer_insert (helptextbuffer, &ht_iter, helpmessage,-1); + #else + gtk_text_buffer_insert (helptextbuffer, &ht_iter, gettext(helpmessage),-1); +@@ -3478,7 +3478,7 @@ + helptext = gtk_text_new(NULL,NULL); + gtk_text_set_editable(GTK_TEXT(helptext), FALSE); + gtk_text_freeze(GTK_TEXT(helptext)); +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + gtk_text_insert(GTK_TEXT(helptext),NULL,NULL,NULL,helpmessage,(gint)strlen(helpmessage)); + #else + gtk_text_insert(GTK_TEXT(helptext),NULL,NULL,NULL,gettext(helpmessage),(gint)strlen(gettext(helpmessage))); +@@ -4480,7 +4480,7 @@ + GTK_SIGNAL_FUNC (Add_template), + GINT_TO_POINTER(tmplnum[5 * i + j]) ); + if ((int)strlen(template_tip[i][j]) >0 ) { +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + gtk_tooltips_set_tip (temptips, tbutton[5 * i + j], + template_tip[i][j], NULL); + #else +@@ -4523,7 +4523,7 @@ + GTK_SIGNAL_FUNC (Add_template), + GINT_TO_POINTER(tmplnum[25 + 5 * i + j]) ); + if ((int)strlen(template_tip[i+5][j]) >0 ) { +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + gtk_tooltips_set_tip (temptips, tbutton[25 + 5 * i + j], + template_tip[i + 5][j], NULL); + #else +@@ -4567,7 +4567,7 @@ + GTK_SIGNAL_FUNC (Add_template), + GINT_TO_POINTER(tmplnum[50 + 5 * i + j]) ); + if ((int)strlen(template_tip[i+10][j]) >0 ) { +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + gtk_tooltips_set_tip (temptips, tbutton[50 + 5 * i + j], + template_tip[i + 10][j], NULL); + #else +@@ -4612,7 +4612,7 @@ + GTK_SIGNAL_FUNC (Add_template), + GINT_TO_POINTER(tmplnum[75 + 5 * i + j]) ); + if ((int)strlen(template_tip[i+15][j]) >0 ) { +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + gtk_tooltips_set_tip (temptips, tbutton[75 + 5 * i + j], + template_tip[i + 15][j], NULL); + #else +@@ -4657,7 +4657,7 @@ + GTK_SIGNAL_FUNC (Add_template), + GINT_TO_POINTER(tmplnum[100 + 5 * i + j]) ); + if ((int)strlen(template_tip[i+20][j]) >0 ) { +-#ifdef DISABLE_NLS ++#ifndef ENABLE_NLS + gtk_tooltips_set_tip (temptips, tbutton[100 + 5 * i + j], + template_tip[i + 20][j], NULL); + #else only in patch2: unchanged: --- chemtool-1.6.12.orig/debian/patches/series +++ chemtool-1.6.12/debian/patches/series @@ -0,0 +1,2 @@ +554084_fix_ftbfs_with_no_add_needed.patch +LP839745_enabling_translation.patch only in patch2: unchanged: --- chemtool-1.6.12.orig/debian/patches/554084_fix_ftbfs_with_no_add_needed.patch +++ chemtool-1.6.12/debian/patches/554084_fix_ftbfs_with_no_add_needed.patch @@ -0,0 +1,19 @@ +Description: Fix a build failure with binutils-gold or -wl,--no-add-needed +Author: Bart Martens +Reviewed-by: Daniel Leidert +Origin: Debian, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554084#17 +Bug-Debian: http://bugs.debian.org/554084 +Forwarded: yes +Last-Update: 2011-10-02 + +--- a/Makefile.in ++++ b/Makefile.in +@@ -72,7 +72,7 @@ + am_chemtool_OBJECTS = main.$(OBJEXT) draw.$(OBJEXT) graph.$(OBJEXT) \ + chemproc.$(OBJEXT) undo.$(OBJEXT) inout.$(OBJEXT) + chemtool_OBJECTS = $(am_chemtool_OBJECTS) +-chemtool_LDADD = $(LDADD) ++chemtool_LDADD = $(LDADD) -lX11 + chemtool_DEPENDENCIES = + src_cht_cht_SOURCES = src-cht/cht.c + src_cht_cht_OBJECTS = cht.$(OBJEXT)