rendered paste body(Feisty)gnomefreak@FeistyFawn:~/iceape-build/iceape-1.1.1/debian$ svn diff
Index: control
===================================================================
--- control (revision 39904)
+++ control (working copy)
@@ -1,9 +1,8 @@
Source: iceape
Section: net
Priority: optional
-Maintainer: Maintainers of Mozilla-related packages <pkg-mozilla-maintainers@lists.alioth.debian.org>
-Uploaders: HJ Heins <hjheins@gmail.com>, Jaldhar H. Vyas <jaldhar@debian.org>, Mike Hommey <glandium@debian.org>, Alexander Sack <asac@debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, dpatch, libgtk2.0-dev, binutils (>= 2.17-1), zip, libjpeg62-dev | libjpeg-dev, libz-dev, libxft-dev (>= 2.1-6), libfontconfig1-dev (>= 2.1-13), libidl-dev (>= 0.8), libxp-dev, libxt-dev, libxau-dev, libcairo2-dev, sharutils, libgnomevfs2-dev, libgnomeui-dev, dpkg-dev (>= 1.13.19), imagemagick, librsvg2-bin, libhunspell-dev (>= 1.1.5-2)
+Maintainer: Alexander Sack
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, dpatch, libgtk2.0-dev, binutils (>= 2.17-1), zip, libjpeg62-dev | libjpeg-dev, libz-dev, libxft-dev (>= 2.1-6), libfontconfig1-dev (>= 2.1-13), libidl-dev (>= 0.8), libxp-dev, libxt-dev, libxau-dev, libcairo2-dev, sharutils, libgnomevfs2-dev, libgnomeui-dev, dpkg-dev (>= 1.13.19), imagemagick, librsvg2-bin, libhunspell-dev (>= 1.1.4-7), libnss3-dev, libnspr4-dev
Standards-Version: 3.7.2.2
Package: iceape
Index: patches/80_hunspell.dpatch
===================================================================
--- patches/80_hunspell.dpatch (revision 39904)
+++ patches/80_hunspell.dpatch (working copy)
@@ -4,92 +4,139 @@
## All lines beginning with `## DP:' are a description of the patch.
## DP: Use hunspell instead of myspell, and link against system library.
-@DPATCH@
-
---- iceape/config/autoconf.mk.in
-+++ iceape/config/autoconf.mk.in
-@@ -190,6 +190,10 @@
+Index: mozilla/config/autoconf.mk.in
+===================================================================
+--- mozilla.orig/config/autoconf.mk.in 2007-04-18 09:22:51.000000000 +0000
++++ mozilla/config/autoconf.mk.in 2007-04-18 09:26:37.000000000 +0000
+@@ -188,16 +188,20 @@
+
+ MOZ_XUL = @MOZ_XUL@
+
+ NECKO_PROTOCOLS = @NECKO_PROTOCOLS@
+ NECKO_DISK_CACHE = @NECKO_DISK_CACHE@
NECKO_SMALL_BUFFERS = @NECKO_SMALL_BUFFERS@
NECKO_COOKIES = @NECKO_COOKIES@
-+MOZ_NATIVE_HUNSPELL = @SYSTEM_HUNSPELL@
-+MOZ_HUNSPELL_LIBS = @MOZ_HUNSPELL_LIBS@
-+MOZ_HUNSPELL_CFLAGS = @MOZ_HUNSPELL_CFLAGS@
++MOZ_NATIVE_MYSPELL = @SYSTEM_MYSPELL@
++MOZ_MYSPELL_LIBS = @MOZ_MYSPELL_LIBS@
++MOZ_MYSPELL_CFLAGS = @MOZ_MYSPELL_CFLAGS@
+
MOZ_NATIVE_ZLIB = @SYSTEM_ZLIB@
MOZ_NATIVE_JPEG = @SYSTEM_JPEG@
MOZ_NATIVE_PNG = @SYSTEM_PNG@
---- iceape/configure.in
-+++ iceape/configure.in
-@@ -3840,6 +3840,19 @@
+ MOZ_TREE_CAIRO = @MOZ_TREE_CAIRO@
+ MOZ_UPDATE_XTERM = @MOZ_UPDATE_XTERM@
+ MOZ_MATHML = @MOZ_MATHML@
+ MOZ_XTF = @MOZ_XTF@
+Index: mozilla/configure.in
+===================================================================
+--- mozilla.orig/configure.in 2007-04-18 09:22:51.000000000 +0000
++++ mozilla/configure.in 2007-04-18 09:26:38.000000000 +0000
+@@ -3859,16 +3859,32 @@
+
+ if test "${PNG_DIR}" -a -d "${PNG_DIR}" -a "$SYSTEM_PNG" = 1; then
+ PNG_CFLAGS="-I${PNG_DIR}/include"
+ PNG_LIBS="-L${PNG_DIR}/lib ${PNG_LIBS}"
+ fi
+
fi # SKIP_LIBRARY_CHECKS
-+dnl system HunSpell Support
++dnl system MySpell Support
+dnl ========================================================
-+MOZ_ARG_ENABLE_BOOL(system-hunspell,
-+[ --enable-system-hunspell Use system hunspell (located with pkgconfig)],
-+ SYSTEM_HUNSPELL=1 )
++MOZ_ARG_ENABLE_BOOL(system-myspell,
++[ --enable-system-myspell Use system myspell (located with pkgconfig)],
++ SYSTEM_MYSPELL=1 )
+
-+if test -n "$SYSTEM_HUNSPELL"; then
-+ PKG_CHECK_MODULES(MOZ_HUNSPELL, hunspell)
++if test -n "$SYSTEM_MYSPELL"; then
++ dnl PKG_CHECK_MODULES(MOZ_MYSPELL, myspell)
++ MOZ_MYSPELL_CFLAGS="-I/usr/include/hunspell -DMySpell=Hunspell"
++ MOZ_MYSPELL_LIBS="-lhunspell"
+fi
+
-+AC_SUBST(SYSTEM_HUNSPELL)
-+AC_SUBST(MOZ_HUNSPELL_LIBS)
++AC_SUBST(SYSTEM_MYSPELL)
++AC_SUBST(MOZ_MYSPELL_LIBS)
++AC_SUBST(MOZ_MYSPELL_CFLAGS)
+
dnl ========================================================
dnl Java SDK support
dnl ========================================================
---- iceape/extensions/spellcheck/myspell/src/Makefile.in
-+++ iceape/extensions/spellcheck/myspell/src/Makefile.in
-@@ -60,15 +60,19 @@
+ JAVA_INCLUDE_PATH=
+ MOZ_ARG_WITH_STRING(java-include-path,
+ [ --with-java-include-path=dir Location of Java SDK headers],
+ JAVA_INCLUDE_PATH=$withval)
+
+Index: mozilla/extensions/spellcheck/myspell/src/Makefile.in
+===================================================================
+--- mozilla.orig/extensions/spellcheck/myspell/src/Makefile.in 2006-06-29 21:23:45.000000000 +0000
++++ mozilla/extensions/spellcheck/myspell/src/Makefile.in 2007-04-18 09:26:38.000000000 +0000
+@@ -55,30 +55,38 @@
+ REQUIRES = xpcom \
+ string \
+ uconv \
+ unicharutil \
+ spellchecker \
xulapp \
$(NULL)
-CPPSRCS = affentry.cpp \
-+CPPSRCS = mozMySpell.cpp \
-+ mozMySpellFactory.cpp \
-+ $(NULL)
-+
-+ifndef MOZ_NATIVE_HUNSPELL
-+CPPSRCS += affentry.cpp \
- affixmgr.cpp \
- hashmgr.cpp \
- suggestmgr.cpp \
- csutil.cpp \
- myspell.cpp \
+- affixmgr.cpp \
+- hashmgr.cpp \
+- suggestmgr.cpp \
+- csutil.cpp \
+- myspell.cpp \
- mozMySpell.cpp \
- mozMySpellFactory.cpp \
++CPPSRCS = mozMySpell.cpp \
++ mozMySpellFactory.cpp \
$(NULL)
++ifndef MOZ_NATIVE_MYSPELL
++CPPSRCS += affentry.cpp \
++ affixmgr.cpp \
++ hashmgr.cpp \
++ suggestmgr.cpp \
++ csutil.cpp \
++ myspell.cpp \
++ $(NULL)
+endif
ifdef MOZ_XUL_APP
CPPSRCS += mozMySpellDirProvider.cpp
-@@ -79,6 +83,11 @@
+ endif
+
+ EXTRA_DSO_LDOPTS = \
+ $(LIBS_DIR) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \
-+ $(MOZ_HUNSPELL_LIBS) \
++ $(MOZ_MYSPELL_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
+
-+ifdef MOZ_NATIVE_HUNSPELL
-+CXXFLAGS += $(MOZ_HUNSPELL_CFLAGS) -DMOZ_NATIVE_HUNSPELL
++ifdef MOZ_NATIVE_MYSPELL
++CXXFLAGS += $(MOZ_MYSPELL_CFLAGS)
+endif
---- iceape/extensions/spellcheck/myspell/src/mozMySpell.h
-+++ iceape/extensions/spellcheck/myspell/src/mozMySpell.h
-@@ -56,7 +56,12 @@
+Index: mozilla/extensions/spellcheck/myspell/src/mozMySpell.h
+===================================================================
+--- mozilla.orig/extensions/spellcheck/myspell/src/mozMySpell.h 2006-06-29 21:46:59.000000000 +0000
++++ mozilla/extensions/spellcheck/myspell/src/mozMySpell.h 2007-04-18 09:26:38.000000000 +0000
+@@ -51,17 +51,17 @@
+ * and affix compression in general, please see:
+ * http://www.cs.ucla.edu/ficus-members/geoff/ispell.html
+ * (the home page for ispell)
+ *
+ * ***** END LICENSE BLOCK ***** */
#ifndef mozMySpell_h__
#define mozMySpell_h__
-+#if MOZ_NATIVE_HUNSPELL
+-#include "myspell.hxx"
+#include "hunspell.hxx"
-+#define MySpell Hunspell
-+#else
- #include "myspell.hxx"
-+#endif
#include "mozISpellCheckingEngine.h"
#include "mozIPersonalDictionary.h"
#include "nsString.h"
+ #include "nsCOMPtr.h"
+ #include "nsIObserver.h"
+ #include "nsIUnicodeEncoder.h"
+ #include "nsIUnicodeDecoder.h"
+ #include "nsInterfaceHashtable.h"
Index: remove.nonfree
===================================================================
--- remove.nonfree (revision 39904)
+++ remove.nonfree (working copy)
@@ -1,7 +1,7 @@
#! /bin/sh
-ORG_NAME="Debian"
-ORG_DOMAIN="www.debian.org"
+ORG_NAME="Ubuntu"
+ORG_DOMAIN="www.ubuntu.com"
rm -fv ./build/wince/shunt/build/shunt.vcb
rm -fv ./build/wince/shunt/build/shunt.vco
Index: iceape-browser.install
===================================================================
--- iceape-browser.install (revision 39904)
+++ iceape-browser.install (working copy)
@@ -3,13 +3,6 @@
usr/sbin/update-iceape-chrome
usr/lib/iceape/.autoreg
usr/lib/iceape/iceape.cfg
-usr/lib/iceape/libnspr4.so
-usr/lib/iceape/libplds4.so
-usr/lib/iceape/libplc4.so
-usr/lib/iceape/libnss3.so
-usr/lib/iceape/libsmime3.so
-usr/lib/iceape/libssl3.so
-usr/lib/iceape/libsoftokn3.so
usr/lib/iceape/libfreebl*.so
usr/lib/iceape/libnssckbi.so
usr/lib/iceape/libmozjs.so
Index: changelog
===================================================================
--- changelog (revision 39904)
+++ changelog (working copy)
@@ -1,3 +1,62 @@
+iceape (1.1.1-3.mt8) feisty; urgency=low
+
+ * Respun with libhunspell-dev 1.1.4-7
+
+ -- John Vivirito <gnomefreak@gmail.com> Tue, 24 Apr 2007 05:09:00 -0400
+
+iceape (1.1.1-3.mt7) feisty; urgency=low
+
+ * respun with newest version of libnspr4-0d installed
+
+ -- John Vivirito <gnomefreak@gmail.com> Thu, 19 Apr 2007 15:22:00 -0400
+
+iceape (1.1.1-3.mt6) feisty; urgency=low
+
+ * debian/control changed build depend libhunspell version from 1.1.5-6 to
+ 1.1.4-7
+
+ -- John Vivirito <gnomefreak@gmail.com> Thu, 19 Apr 2007 14:20:00 -0400
+
+iceape (1.1.1-3.mt5) feisty; urgency=low
+
+ * debian/mozconfig, added build options --with-system-nspr --with-system
+ -nss to add nspr and nss support to iceape.
+ * debian/control, added build depends libnspr4-dev and libnss3-dev
+
+ -- John Vivirito <gnomefreak@gmail.com> Tue, 17 Apr 2007 06:50:54 -0400
+
+iceape (1.1.1-3.mt4) feisty; urgency=low
+
+ * Fixed debian/changelog
+
+ -- John Vivirito <gnomefreak@gmail.com> Wed, 11 Apr 2007 20:48:11 -0400
+
+iceape (1.1.1-3.mt3) feisty; urgency=low
+
+ * Debian/rules Changed Debian branding to Ubuntu for Help>About
+ * Debian/control, removed Debian maintainers and added Alexander as maintainer
+
+ -- John Vivirito <gnomefreak@gmail.com> Wed, 11 Apr 2007 11:09:45 -0400
+
+iceape (1.1.1-3.mt2) feisty; urgency=low
+
+ * Changed debian/remove.nonfree to adapt it to ubuntu
+
+ -- John Vivirito <gnomefreak@gmail.com> Tue, 10 Apr 2007 13:56:36 -0400
+
+iceape (1.1.1-3.mt1) feisty; urgency=low
+
+ * Regenerated orig.tar
+
+ -- John Vivirito <gnomefreak@gmail.com> Fri, 6 Apr 2007 07:25:00 -0400
+
+
+iceape (1.1.1-3.mt0) feisty; urgency=low
+
+ * Initial Release, built for Ubuntu Mozilla Team
+
+ -- John Vivirito <gnomefreak@gmail.com> Tue, 3 Apr 2007 17:31:24 -0400
+
iceape (1.1.1-3) unstable; urgency=low
* debian/control, debian/rules: Removed dummy packages for transition from
Index: rules
===================================================================
--- rules (revision 39904)
+++ rules (working copy)
@@ -206,7 +206,7 @@
>> debian/tmp/usr/lib/iceape/defaults/pref/vendor.js
echo "pref(\"general.useragent.productSub\",\"$(BUILD_DATE)\");" \
>> debian/tmp/usr/lib/iceape/defaults/pref/vendor.js
- echo "pref(\"general.useragent.extra.iceapeComment\",\"(Debian-$(DEBIAN_VERSION))\");" \
+ echo "pref(\"general.useragent.extra.iceapeComment\",\"(Ubuntu-$(DEBIAN_VERSION))\");" \
>> debian/tmp/usr/lib/iceape/defaults/pref/vendor.js
cp -f LICENSE MPL
Index: mozconfig
===================================================================
--- mozconfig (revision 39904)
+++ mozconfig (working copy)
@@ -37,3 +37,5 @@
#ac_add_options --enable-static-mail
#ac_add_options --enable-calendar
#ac_add_options --enable-ctl
+ac_add_options --with-system-nspr
+ac_add_optons --with-system-nss
(Feisty)gnomefreak@FeistyFawn:~/iceape-build/iceape-1.1.1/debian$