Package: tea
Version: 28.1.1-1
Tags: patch
Severity: serious

In Ubuntu, we've applied the attached patch to achieve the following:

  * src.pro: Added -lz -lX11 to LIBS for binutils-gold, 
    fixes FTBFS (LP: #664662)
  * debian/control: Added zlib1g-dev to build-dep

We thought you might be interested in doing the same.

diff -Nru tea-28.1.1/debian/changelog tea-28.1.1/debian/changelog
--- tea-28.1.1/debian/changelog	2010-08-06 15:42:56.000000000 +0100
+++ tea-28.1.1/debian/changelog	2010-10-21 19:44:30.000000000 +0100
@@ -1,3 +1,11 @@
+tea (28.1.1-1ubuntu1) natty; urgency=low
+
+  * src.pro: Added -lz -lX11 to LIBS for binutils-gold, 
+    fixes FTBFS (LP: #664662)
+  * debian/control: Added zlib1g-dev to build-dep
+
+ -- Roy Jamison <[email protected]>  Thu, 21 Oct 2010 18:43:55 +0100
+
 tea (28.1.1-1) unstable; urgency=low
 
   * New upstream version
diff -Nru tea-28.1.1/debian/control tea-28.1.1/debian/control
--- tea-28.1.1/debian/control	2010-08-06 15:43:04.000000000 +0100
+++ tea-28.1.1/debian/control	2010-10-21 18:54:35.000000000 +0100
@@ -1,9 +1,10 @@
 Source: tea
 Section: editors
 Priority: optional
-Maintainer: Tobias Quathamer <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+XSBC-Original-Maintainer: Tobias Quathamer <[email protected]>
 Build-Depends: debhelper (>= 7.0.50~), pkg-config, libqt4-dev,
- libaspell-dev, libhunspell-dev, libx11-dev
+ libaspell-dev, libhunspell-dev, libx11-dev, zlib1g-dev
 Standards-Version: 3.9.1
 Homepage: http://tea-editor.sourceforge.net/
 
diff -Nru tea-28.1.1/debian/patches/debian-changes-28.1.1-1ubuntu1 tea-28.1.1/debian/patches/debian-changes-28.1.1-1ubuntu1
--- tea-28.1.1/debian/patches/debian-changes-28.1.1-1ubuntu1	1970-01-01 01:00:00.000000000 +0100
+++ tea-28.1.1/debian/patches/debian-changes-28.1.1-1ubuntu1	2010-10-21 19:44:49.000000000 +0100
@@ -0,0 +1,39 @@
+Description: Upstream changes introduced in version 28.1.1-1ubuntu1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ tea (28.1.1-1ubuntu1) natty; urgency=low
+ .
+   * src.pro: Added -lz -lX11 to LIBS for binutils-gold,
+     fixes FTBFS (LP: #664662)
+   * debian/control: Added zlib1g-dev to build-dep
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Roy Jamison <[email protected]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/664662
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- tea-28.1.1.orig/src.pro
++++ tea-28.1.1/src.pro
+@@ -120,7 +120,7 @@ DISTFILES += ChangeLog \
+ contains(USE_ASPELL,true){
+ exists("/usr/include/aspell.h") { 
+     message ("ASpell enabled")
+-    LIBS += -laspell
++    LIBS += -laspell -lz -lX11
+     DEFINES += ASPELL_ENABLE
+     DEFINES += SPELLCHECK_ENABLE
+ }
diff -Nru tea-28.1.1/debian/patches/series tea-28.1.1/debian/patches/series
--- tea-28.1.1/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ tea-28.1.1/debian/patches/series	2010-10-21 18:45:27.000000000 +0100
@@ -0,0 +1 @@
+debian-changes-28.1.1-1ubuntu1

Reply via email to