gnomefreak@FeistyFawn:~/iceape-feisty/iceape-1.1.1/debian$ svn diff
Index: control
===================================================================
--- control (revision 39888)
+++ control (working copy)
@@ -1,8 +1,7 @@
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>
+Maintainer: Alexander Sack <asac@ubuntu.com>
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, libmyspell-dev, dpkg-dev (>= 1.13.19), imagemagick, librsvg2-bin
Standards-Version: 3.7.2.2
Index: rules
===================================================================
--- rules (revision 39888)
+++ rules (working copy)
@@ -212,7 +212,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: remove.nonfree
===================================================================
--- remove.nonfree (revision 39888)
+++ 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: changelog
===================================================================
--- changelog (revision 39888)
+++ changelog (working copy)
@@ -1,328 +1,25 @@
-iceape (1.1.1-3) experimental; urgency=low
+iceape (1.1.1-3.mt3) feisty; urgency=low
- * debian/patches/20_visibility.dpatch: update from bz366844 to prevent
- failures due to bashism
- * debian/patches/60_distclean.dpatch: use DIST_GARBAGE for sqlite3.h
- instead of GARBAGE to prevent ftbfs on second run -> sqlite4.h is
- a source file; maybe drop this completely.
- * debian/patches/99_configure.dpatch: update configure accordingly
+ * Debian/rules Changed Debian branding to Ubuntu for Help>About
+ * Debian/control, removed Debian maintainers and added Alexander as maintainer
- -- Alexander Sack <asac@debian.org> Mon, 2 Apr 2007 16:43:29 +0200
+ -- John Vivirito <gnomefreak@gmail.com> Wed, 11 Apr 2007 11:09:45 -0400
-iceape (1.1.1-2) experimental; urgency=low
+iceape (1.1.1-3.mt2) feisty; urgency=low
- * Merged changes from 1.0.8-4.
- * debian/patches/15_gecko_1.8.0.11.dpatch: Replaced with
- debian/patches/15_gecko_1.8.1.3.dpatch, for 1.8.1 branch.
- * debian/patches/00list: Updated accordingly.
+ * Changed debian/remove.nonfree to adapt it to ubuntu
- -- Mike Hommey <glandium@debian.org> Mon, 26 Mar 2007 07:53:26 +0200
+ -- John Vivirito <gnomefreak@gmail.com> Tue, 10 Apr 2007 13:56:36 -0400
-iceape (1.0.8-4) unstable; urgency=low
+iceape (1.1.1-3.mt1) feisty; urgency=low
- * debian/iceape-composer.png.uue, debian/iceape-news.png.uue: Removed,
- as they are not used.
- * debian/patches/15_gecko_1.8.0.11.dpatch: Update to 1.8.0.11 codebase.
- Fixes mfsa-2007-11.
- * debian/patches/00list: Updated accordingly.
- * debian/patches/25_gnome_helpers_with_params.dpatch: Make MIME registry
- use system mime.types when it doesn't get extensions from the Gnome
- registry. This will make the helper configuration dialogs work better.
- * debian/rules: Install several icons in the hicolor theme.
- * debian/iceape-browser.install:
- + Install /usr/lib/iceape/chrome/icons/default/default.xpm and
- /usr/lib/iceape/chrome/icons/default/default16.xpm files that were
- missing.
- + Install files from the hicolor theme.
- * debian/patches/10_icons.dpath: Install the icons into the correct place.
+ * Regenerated orig.tar
- -- Mike Hommey <glandium@debian.org> Sat, 24 Mar 2007 00:54:51 +0100
+ -- John Vivirito <gnomefreak@gmail.com> Fri, 6 Apr 2007 07:25:00 -0400
-iceape (1.1.1-1) experimental; urgency=low
- * New upstream release, targetted at experimental. Closes: #409295.
- * debian/patches/10_dash_workaround.dpatch,
- debian/patches/10_pangoxft.dpatch,
- debian/patches/15_atk_crash.dpatch,
- debian/patches/15_passwdmgr.dpatch,
- debian/patches/82_ssl.dpatch: Removed, as being applied upstream.
- * debian/patches/00list: Updated accordingly.
- * debian/patches/20_visibility.dpatch: Stole new version of the visibility
- patch from iceweasel.
- * debian/patches/60_distclean.dpatch,
- debian/patches/80_security_build.dpatch,
- debian/patches/82_prefs.dpatch,
- debian/patches/85_about.dpatch: Adapted to upstream changes.
- * debian/iceape-calendar.install, debian/iceape-calendar.links,
- debian/rules, debian/mozconfig, debian/patches/60_distclean.dpatch,
- debian/patches/85_release_notes.dpatch, debian/patches/00list: Disabled
- calendar, as it is not provided by the upstream tarball anymore.
- * debian/control, debian/iceape-calendar.NEWS: Add a note that the
- calendar package is empty.
- * debian/iceape-calendar.menu: Renamed as .disabled.
- * debian/iceape-browser.install, debian/iceape-browser.links:
- + Install new components
- + Don't install the webdav component that was provided by the calendar
- + Install the inspector.xpt file, since the inspector component is now
- a static component.
- + Update link for myspell dictionaries.
- * debian/iceape-dom-inspector.install: Don't install the inspector
- component.
- * debian/iceape-dom-inspector.links: Removed.
- * debian/mozconfig: Don't disable xpcom obsolete, it is needed for
- xpinstall.
- * debian/patches/99_configure.dpatch: Updated with autoconf.
+iceape (1.1.1-3.mt0) feisty; urgency=low
- -- Mike Hommey <glandium@debian.org> Tue, 13 Mar 2007 07:59:52 +0100
+ * Initial Release, built for Ubuntu Mozilla Team
-iceape (1.0.8-3) unstable; urgency=low
-
- * debian/patches/15_passwdmgr.dpatch: Restore parts that were actually
- NOT applied upstream, and adapt them. Thanks Sam Hocevar for spotting
- this. Closes: #414010.
-
- -- Mike Hommey <glandium@debian.org> Thu, 8 Mar 2007 18:50:21 +0100
-
-iceape (1.0.8-2) unstable; urgency=low
-
- * debian/copyright: Added licensing terms for the content in the debian
- directory.
- * debian/patches/35_xembed_crash.dpatch: Removed. The problem lies in the
- totem plugin, actually. Closes: #413256.
- * debian/about_debian.js: Custom component to add support for
- about:README.Debian and about:bugs addresses.
- * debian/iceape-browser.install, debian/iceape-browser.links, debian/rules:
- Install the new about_debian.js component.
- * debian/patches/85_about.dpatch: Link to newly added about:bugs and
- about:README.Debian pages instead of direct links.
- * debian/patches/35_about_security.dpatch: Removed, since we don't directly
- link to file:/// and http:// urls anymore.
- * debian/patches/85_release_notes.dpatch: Remove "Release Notes" item from
- Help menu.
- * debian/patches/00list: Updated accordingly.
-
- -- Mike Hommey <glandium@debian.org> Sun, 4 Mar 2007 20:58:30 +0100
-
-iceape (1.0.8-1) unstable; urgency=low
-
- * New upstream release.
- * Fixes mfsa-2007-{01-07}, also known as
- CVE-2006-6077, CVE-2007-0008, CVE-2007-0009, CVE-2007-0045,
- CVE-2007-0775, CVE-2007-0776, CVE-2007-0777, CVE-2007-0778,
- CVE-2007-0779, CVE-2007-0780, CVE-2007-0800, CVE-2007-0981,
- CVE-2007-0995.
- * debian/iceape-browser.install: Install libfreebl.
- * debian/rules:
- + Invert /usr/share/pixmaps/iceape-mailnews.xpm and
- /usr/share/pixmaps/iceape-mail-compose.xpm. Closes: #409812.
- + Do shlibsign on libsoftokn and libfreebl.
- * debian/patches/25_passwdmgr_crash.dpatch,
- debian/patches/20_broken_perl.dpatch: Removed, as being applied upstream.
- * debian/patches/18_kbsd_nspr.dpatch, debian/patches/25_entropy.dpatch,
- debian/patches/35_system_myspell.dpatch, debian/patches/38_kbsd.dpatch,
- debian/patches/80_security_build.dpatch: Adapted to upstream changes.
- * debian/patches/60_distclean.dpatch: Removed parts that were applied
- upstream ; added another cleanup in nss directory.
- * debian/patches/15_passwdmgr.dpatch: Removed parts that were applied
- upstream.
- * debian/patches/99_configure.dpatch: Updated with autoconf.
- * debian/patches/35_theme_switch.dpatch: Fix for hang up when switching
- GTK theme. bz#352096.
- * debian/patches/35_xembed_crash.dpatch: Fix for crash on restyle after
- closing tab with xembed plugin. bz#359870. Thanks Alexander Sack.
- * debian/patches/00list: Updated accordingly.
-
- -- Mike Hommey <glandium@debian.org> Fri, 2 Mar 2007 23:04:24 +0100
-
-iceape (1.0.7-3) unstable; urgency=low
-
- * debian/mozilla-browser.postinst: Renamed to mozilla-browser.postrm, since
- it is about postrm rules for purge.
- * debian/control:
- + Make iceape conflict with mozilla (<< 2:1.8) instead of mozilla.
- Closes: #405911.
- + iceape is built without xprint support, drop outdated and useless
- Suggests to xprt. Thanks to Andreas Metzler. Closes: #301649.
- * debian/iceape-browser.prerm: Don't forget to remove the alternatives at
- removal time. Closes: #407411.
- * debian/iceape-runner:
- + Add missing quotes in a test. Thanks to Kevin Ryde. Closes: #408575.
- + Add check on ${HOME}. Closes: #361999, #294425.
- * debian/patches/65_composer_charset.dpatch: Align editor character set with
- meta tag character set at document creation. Closes: #408220.
- * debian/patches/15_atk_crash.dpatch: Fix random crashed in GetMaiAtkType.
- bz#302250. Closes: #406861.
- * debian/patches/18_m68k_xpcom.dpatch: Apply changes provided by Roman
- Zippel to fix FTBFS of third party software on m68k. Renamed as
- 68_m68k_xpcom.dpatch, since it needs to be sent upstream. (Stolen from
- xulrunner)
- * debian/patches/35_zip_cache.dpatch: Invalidate cache for a zip file that
- got modified. It will prevent corruption of the XUL FastLoad cache when
- upgrade is performed while an instance of the application is running.
- bz#368428. Closes: #406618.
- * debian/patches/80_calendar_locale.dpatch: Don't install calendar locales.
- Closes: #406748. Locale packagers: Please add the locales from the
- calendar but double check that they include all the strings.
- * debian/patches/82_prefs.dpatch: Workaround for freeze error with mail
- compose window after a couple of hours of use. bz#307672. Closes: #405662.
- * debian/extras/iceape_icon_plain.svg, debian/extras/iceape_logo_plain.svg,
- debian/extras/iceape_logo_splash.xpm: Changed colors and improved contrast
- on logo and icon. Closes: #408441.
- * debian/extras/calendar_orig_309293.svg: Removed, because it is non-free.
- * debian/iceape-calendar.install: Install calendar.jar instead of calendar*.
- * debian/patches/25_pango_null_char.dpatch: Avoid freeze/crash when null
- characters are present in justified text by discarding NULL characters
- before displaying. bz#366902. (Stolen from xulrunner svn)
- Closes: #406698.
- * debian/patches/38_sparc64_unichar_alignment.dpatch: Add ia64 to the
- list of arches that need strict alignment. (Stolen from iceweasel svn)
- * debian/patches/15_pango_textarea_position.dpatch: Fix for cursor position
- when moving in a textarea. bz#366796. Closes: #408913.
- * debian/patches/00list: Updated accordingly.
-
- -- Mike Hommey <glandium@debian.org> Mon, 29 Jan 2007 08:12:13 +0100
-
-iceape (1.0.7-2) unstable; urgency=high
-
- * The "OMFFSM" Release !
-
- * debian/iceape-browser.preinst: Move files from /usr/lib/iceape/chrome, not
- ., dammit ! Closes: #405586.
-
- -- Mike Hommey <glandium@debian.org> Thu, 4 Jan 2007 20:24:44 +0100
-
-iceape (1.0.7-1) unstable; urgency=low
-
- [ Mike Hommey ]
- * New upstream release. Fixes mfsa-2006-{68-74} also known as
- CVE-2006-6497, CVE-2006-6498, CVE-2006-6499, CVE-2006-6500,
- CVE-2006-6501, CVE-2006-6502, CVE-2006-6503, CVE-2006-6504.
- Closes: #404892.
-
- * This release is dedicated to Andreas Metzler, who is doing a great job at
- bug triaging the huge pile of bugs that has been accumulating for years
- on mozilla-* packages.
-
- [ Alexander Sack ]
- * debian/extras/iceape_icon_plain.svg,debian/extras/calendar_orig_309293.svg,
- debian/extras/iceape_logo_splash.xpm,debian/extras/iceape_logo.svg,
- debian/extras/calendar.svg,debian/extras/iceape_logo_plain.svg,
- debian/extras/iceape_icon.svg,debian/extras/license.txt,
- debian/extras/Throbber-small.png.uue,debian/extras/Throbber-small.gif.uue,
- debian/control,debian/rules, debian/patches/81_free_art_improvements.dpatch:
- Adding free artwork contributed by unicko2000 aka Ricardo Fernándezi
- <unicko2000@yahoo.es>; added build-depends on imagemagick and librsvg2-bin
- to convert svg artwork to various image formats; generate various image
- formats of free artwork and place them in build tree appropriately. Picking
- Throbber Icons from toolkit to replace trademarked seamonkey throbber.
- Closes: #401265.
- * debian/patches/81_free_art_improvements.dpatch: use .png for about:logo
- instead of .gif ... to improve about page appearence.
- * debian/rules,debian/remove.nonfree: Execute debian/remove.nonfree
- in source target; adding more trademarked logos/icons to remove list;
- for now sedding hardcoded sunbird trademarks in
- calendar/sunbird/app/brand.properties and
- calendar/sunbird/app/brand.dtd. Closes: #400341,#401266.
- * debian/patches/80_free_art_fixes.dpatch: added patch to prevent build
- failure due to removed throbber icons that are not used
- by seamonkey
- * debian/patches/65_branding_bug_401824.dpatch: fix for profile branding bug
- Closes: #401824.
- * debian/patches/00list: added 81_free_art_improvements, 80_free_art_fixes,
- 65_branding_bug_401824
-
- [ Mike Hommey ]
- * Removed non-free and sourceless binaries from source package
- with the script from the gnuzilla project, with 2 additional removals of
- IETF files. Closes: #401266.
- You can find this modified script for reference in debian/remove.nonfree.
- Note this script also removes useless CVS files.
- * debian/control: iceape-chatzilla conflicts with older versions of
- mozilla-browser. Closes: #401298.
- * debian/watch: Added a watch file to track seamonkey versions.
- * debian/patches/80_config.dpatch: Use config.guess and config.sub from
- autotools-dev.
- * debian/iceape-runner:
- + Removed -a option passed to iceape (but we keep the parsing, for when it
- will become useful). This option prevented iceape to start with the
- configured application. Closes: #401620.
- + Added a MOZ_PLUGIN_PATH to add support for plugins in
- /usr/lib/mozilla/plugins. Closes: #404258.
- + Removed some bashisms.
- * debian/watch: Added rule to mangle dfsg versions.
- * debian/patches/15_passwdmgr.dpatch: Adapted to changes in upstream. Thanks
- to Andreas Metzler.
- * debian/patches/35_crash_focus.dpatch: Removed: applied upstream.
- * debian/iceape-browser.preinst: Move files away from /usr/lib/iceape/chrome
- to /usr/share/iceape/chrome if there are. Thanks to Andreas Barth. Closes:
- #401372.
- * debian/patches/82_prefs.dpatch: Set filename for general config file for
- locks and set the obscure value to 0 so that the file needs not be
- "encrypted".
- * debian/iceape.cfg: Disable upgrade notification and lock the value of the
- property so that it is not possible to change it from the UI. Thanks to
- Thijs Kinkhorst for the hint on the preference.
- * debian/rules, debian/iceape-browser.install: Install iceape.cfg.
- Closes: #404699.
- * debian/README.Debian: Rewrote, stealing stuff we wrote for
- firefox^Wiceweasel, including a note about Emacs key bindings.
- Closes: #199090, #291418, #292435, #294542, #296347, #306213.
- * debian/control: Fix mozilla-js-debugger package description to refer to
- mozilla-venkman instead of iceape. Thanks to Andreas Metzler.
- * debian/README.build: Removed.
- * debian/README.chrome: Put reference on mozilla-venkman and mozilla-checky
- instead of non-existant iceape-locale-ja.
- * debian/README.source: Added instructions on how to get the patched sources
- and to build the package from SVN. Thanks to Andreas Metzler.
- * debian/copyright: Fixed typos. Thanks to Thijs Kinkhorst. Closes: #405225.
- * debian/homepagereset.js: Custom component to reset the browser homepage if
- it is set to the old localstart.html page from the mozilla-browser
- package, which doesn't exist any more.
- * debian/patches/85_about.dpatch: Beautifulize about: page (enhancements
- stolen from Firefox) and added some useful links for Debian.
- * debian/patches/82_homepage.dpatch: Set homepage and throbber url to
- about:.
- * debian/patches/35_about_security.dpatch: Relax security on what about:
- urls can load, to match that of chrome and resources urls. bz#365526.
- * debian/rules, debian/iceape-browser.install, debian/iceape-browser.links:
- Install this custom component. Closes: #401537, #402337.
- * debian/iceape-dom-inspector.install: Only install inspector.jar from
- chrome, manifest files are not useful for iceape (yet).
- * debian/menu_dir/iceape.desktop: Set this menu item to be used for the
- Iceape Suite. Which means that will open whatever is configured to be
- opened at Iceape Suite startup (see preferences).
- * debian/menu_dir/iceape-navigator.desktop: Add a new menu item for the
- Iceape Navigator, which will launch a browser window.
- * debian/iceape-browser.install: Install this new desktop file.
- * debian/patches/65_xremote.dpatch: Add commands to open calendar, chatzilla
- and address book via the XRemote interface.
- * debian/iceape-runner: Modify to make use of the new commands in the
- XRemote interface. This means iceape -chat and friends works whether an
- iceape window is already opened or not.
- * debian/patches/38_kbsd.dpatch, debian/patches/38_mips64_build.dpatch,
- debian/patches/80_uname.dpatch, debian/patches/18_kbsd_nspr.dpatch:
- Applied patch from Petr Salinger to build on GNU/kFreeBSD.
- Closes: #401401.
- * debian/patches/99configure: Updated.
- * debian/patches/35_mail_navigator_overlay.dpatch: Set the overlay for
- mailnews options in navigator in mailnews instead of navigator. bz#365701.
- Closes: #227705.
- * debian/patches/00list: Updated according to all modified and added patches.
- * debian/update-iceape-chrome: Redirect regchrome's stderr, too.
- * debian/patches/80_uname.dpatch: Fix OS_TARGET so that it is correctly set
- to Linux for things that expect this value instead of linux-gnu.
- * debian/control: Various changes in packages descriptions.
- Closes: #401431, #403047.
-
- [ Alexander Sack ]
- * debian/rules: update target 'source' to not include epoch in generated
- orig.tar.gz name. Patch by Andreas Metzler.
-
- -- Mike Hommey <glandium@debian.org> Wed, 3 Jan 2007 19:37:41 +0100
-
-iceape (1.0.6-1) unstable; urgency=low
-
- * Initial Release. (Closes: #350740)
- * Thanks to Hendrik-Jan Heins for his help.
-
- -- Mike Hommey <glandium@debian.org> Thu, 23 Nov 2006 00:05:52 +0100
+ -- John Vivirito <gnomefreak@gmail.com> Tue, 3 Apr 2007 17:31:24 -0400
gnomefreak@FeistyFawn:~/iceape-feisty/iceape-1.1.1/debian$