diff -u mozilla-thunderbird-0.8/debian/control mozilla-thunderbird-0.8/debian/control --- mozilla-thunderbird-0.8/debian/control +++ mozilla-thunderbird-0.8/debian/control @@ -2,7 +2,7 @@ Section: mail Priority: optional Maintainer: Alexander Sack -Build-Depends: debhelper, base-files, binutils, coreutils, libc6-dev, libgtk2.0-dev, libidl-dev (>= 0.8.0 ), libx11-dev, libxp-dev, libxt-dev, zlib1g-dev, docbook-to-man, csh, zip, dpatch, m4, bzip2, unzip +Build-Depends: debhelper, base-files, binutils, libc6-dev, libgtk2.0-dev, libidl-dev (>= 0.7.4), zlib1g-dev, docbook-to-man, csh, zip, dpatch, m4, bzip2, unzip Standards-Version: 3.6.1 Package: mozilla-thunderbird @@ -17,18 +17,6 @@ the XUL user interface language. Mozilla Thunderbird leaves a somewhat smaller memory footprint than the Mozilla suite. -#Package: mozilla-thunderbird-enigmail -#Architecture: any -#Depends: mozilla-thunderbird (=${Source-Version}), ${shlibs:Depends}, gnupg -#Description: Enigmail - GPG support for Mozilla Thunderbird -# Enigmail is an extension to Mozilla Thunderbird. It allows users to -# access the features provided by the popular GnuPG software from within -# Mozilla Thunderbird. -# . -# Enigmail is capable of signing, authenticating, encrypting and decrypting -# email.Additionally, it supports both the inline PGP format, as well as the -# PGP/MIME format as described in RFC 3156. -# Package: mozilla-thunderbird-offline Architecture: any Depends: mozilla-thunderbird (=${Source-Version}) @@ -62,10 +49,0 @@ - -#Package: mozilla-thunderbird-calendar -#Architecture: any -#Depends: mozilla-thunderbird (=${Source-Version}), ${shlibs:Depends} -#Description: mozilla thunderbird calendar extension leveraging ical standards -# The Mozilla Thunderbird calendar extension. The Mozilla Calendar project -# strives to build a cross-platform fully standards based calendar client -# based on the open iCal standard. The calendar client is built using the -# XUL user interface language and is targeted for any Mozilla based -# application. This includes Mozilla Thunderbird et al. diff -u mozilla-thunderbird-0.8/debian/rules mozilla-thunderbird-0.8/debian/rules --- mozilla-thunderbird-0.8/debian/rules +++ mozilla-thunderbird-0.8/debian/rules @@ -83,7 +83,7 @@ --enable-extensions=wallet,spellcheck,xmlextras,typeaheadfind,inspector,webservices \ --enable-necko-protocols=http,file,jar,viewsource,res,data \ --enable-image-decoders=default,-xbm \ - --enable-xft \ + --disable-xft \ --enable-xprint \ $(NULL) diff -u mozilla-thunderbird-0.8/debian/changelog mozilla-thunderbird-0.8/debian/changelog --- mozilla-thunderbird-0.8/debian/changelog +++ mozilla-thunderbird-0.8/debian/changelog @@ -1,3 +1,13 @@ +mozilla-thunderbird (0.8-0.backports.org.1) unstable; urgency=medium + + * recompiled for http://www.backports.org/ + + added patch that modifies configure script to work with older libidl + + reduced required version of libidl-dev build-dependency + + disabled xft support in debian/rules + + removed coreutils and libgnomevfs2-dev build-dependencies + + -- Norbert Tretkowski Sat, 18 Sep 2004 19:21:33 +0200 + mozilla-thunderbird (0.8-1) unstable; urgency=medium * new upstream version 0.8 diff -u mozilla-thunderbird-0.8/debian/patches/00list mozilla-thunderbird-0.8/debian/patches/00list --- mozilla-thunderbird-0.8/debian/patches/00list +++ mozilla-thunderbird-0.8/debian/patches/00list @@ -1,3 +1,4 @@ +01_older-libidl 10_debian-thunderbird 10_profile_migration 10_debian-basemail-unix only in patch2: unchanged: --- mozilla-thunderbird-0.8.orig/debian/patches/01_older-libidl.dpatch +++ mozilla-thunderbird-0.8/debian/patches/01_older-libidl.dpatch @@ -0,0 +1,70 @@ +#!/bin/sh -e +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur mozilla-thunderbird-0.8.orig/configure mozilla-thunderbird-0.8/configure +--- mozilla.orig/configure 2004-09-10 19:34:30.000000000 +0200 ++++ mozilla/configure 2004-09-18 19:18:14.000000000 +0200 +@@ -14846,28 +14846,28 @@ + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 +-echo "configure:14851: checking for libIDL-2.0 >= 0.8.0" >&5 ++ echo $ac_n "checking for libIDL-2.0 >= 0.7.4""... $ac_c" 1>&6 ++echo "configure:14851: checking for libIDL-2.0 >= 0.7.4" >&5 + +- if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then ++ if $PKG_CONFIG --exists "libIDL-2.0 >= 0.7.4" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 + echo "configure:14858: checking LIBIDL_CFLAGS" >&5 +- LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` ++ LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.7.4"` + echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 + + echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 + echo "configure:14863: checking LIBIDL_LIBS" >&5 +- LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"` ++ LIBIDL_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.7.4"` + echo "$ac_t""$LIBIDL_LIBS" 1>&6 + else + LIBIDL_CFLAGS="" + LIBIDL_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. +- LIBIDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL-2.0 >= 0.8.0"` ++ LIBIDL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libIDL-2.0 >= 0.7.4"` + echo $LIBIDL_PKG_ERRORS + fi + +@@ -14882,7 +14882,7 @@ + if test $succeeded = yes; then + _LIBIDL_FOUND=1 + else +- { echo "configure: error: Library requirements (libIDL-2.0 >= 0.8.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } ++ { echo "configure: error: Library requirements (libIDL-2.0 >= 0.7.4) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + fi + + fi