------------------------------------------------------------
revno: 522
committer: Micah Gersten <micahg@ubuntu.com>
branch nick: firefox-3.6.head
timestamp: Mon 2010-02-15 21:24:17 -0600
message:
  * Install apport hook
    - update debian/firefox.install
diff:
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-16 03:23:26 +0000
+++ debian/changelog	2010-02-16 03:24:17 +0000
@@ -15,8 +15,10 @@
   * Update apport hook to pull from unversioned profile directory
   * Update apport hook to report on non-distro package
     - update debian/apport/firefox.py
+  * Install apport hook
+    - update debian/firefox.install

- -- Micah Gersten <micahg@ubuntu.com>  Mon, 15 Feb 2010 21:23:01 -0600
+ -- Micah Gersten <micahg@ubuntu.com>  Mon, 15 Feb 2010 21:24:06 -0600

 firefox (3.6+nobinonly-0ubuntu2) lucid; urgency=low


=== modified file 'debian/firefox.install'
--- debian/firefox.install	2010-01-21 00:13:41 +0000
+++ debian/firefox.install	2010-02-16 03:24:17 +0000
@@ -23,4 +23,4 @@
 debian/tmp/usr/lib/firefox-*/*.ini

 # Don't install the apport hook for now.
-# debian/apport/firefox.py usr/share/apport/package-hooks/
+debian/apport/firefox.py usr/share/apport/package-hooks/
------------------------------------------------------------
revno: 521
committer: Micah Gersten <micahg@ubuntu.com>
branch nick: firefox-3.6.head
timestamp: Mon 2010-02-15 21:23:26 -0600
message:
  Update apport hook to report on non-distro package
diff:
=== modified file 'debian/apport/firefox.py'
--- debian/apport/firefox.py	2010-02-15 17:05:20 +0000
+++ debian/apport/firefox.py	2010-02-16 03:23:26 +0000
@@ -115,6 +115,28 @@
     return lines

 def add_info(report):
+
+    if not apport.packaging.is_distro_package(report['Package'].split()[0]):
+        report['ThirdParty'] = 'True'
+        report['CrashDB'] = 'ubuntu'
+	report['Tags'] = 'ppa'
+
+    packages = ['firefox',
+                'firefox-gnome-support',
+                'firefox-branding']
+
+    versions = ''
+    for package in packages:
+        try:
+            version = packaging.get_version(package)
+        except ValueError:
+            version = 'N/A'
+        if version is None:
+            version = 'N/A'
+        versions += '%s %s\n' % (package, version)
+    report['FirefoxPackages'] = versions
+
+
     '''adds hooked info into the apport report.'''
     config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox')
     profiles_d = {}

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-15 17:05:20 +0000
+++ debian/changelog	2010-02-16 03:23:26 +0000
@@ -1,6 +1,6 @@
 firefox (3.6+nobinonly-0ubuntu3) UNRELEASED; urgency=low

-  [ Alexander Sack ]
+  [ Alexander Sack <asac@ubuntu.com> ]
   * fix LP: #520963 - sysprefs not honoured since firefox is built without
     system xulrunner; resurrect the patch we ship in xulrunner
     - add debian/patches/add_syspref_dir.patch
@@ -9,13 +9,14 @@
     distribution.searchplugins.defaultLocale in syspref firefox.js
     - update debian/firefox.js

-  [ Micah Gersten ]
+  [ Micah Gersten <micahg@ubuntu.com> ]
   * Rename apport hook to firefox.py (unversioned)
     - rename debian/apport/firefox-3.6.py => debian/apport/firefox.py
   * Update apport hook to pull from unversioned profile directory
+  * Update apport hook to report on non-distro package
     - update debian/apport/firefox.py

- -- Micah Gersten <micahg@ubuntu.com>  Mon, 15 Feb 2010 11:04:11 -0600
+ -- Micah Gersten <micahg@ubuntu.com>  Mon, 15 Feb 2010 21:23:01 -0600

 firefox (3.6+nobinonly-0ubuntu2) lucid; urgency=low
------------------------------------------------------------
revno: 520
committer: Micah Gersten <micahg@ubuntu.com>
branch nick: firefox-3.6.head
timestamp: Mon 2010-02-15 11:05:20 -0600
message:
  * Rename apport hook to firefox.py (unversioned)
    - rename debian/apport/firefox-3.6.py => debian/apport/firefox.py
  * Update apport hook to pull from unversioned profile directory
    - update debian/apport/firefox.py
diff:
=== renamed file 'debian/apport/firefox-3.6.py' => 'debian/apport/firefox.py'
--- debian/apport/firefox-3.6.py	2009-12-15 15:16:06 +0000
+++ debian/apport/firefox.py	2010-02-15 17:05:20 +0000
@@ -1,6 +1,6 @@
 '''firefox apport hook draft

-/usr/share/apport/package-hooks/firefox-3.6.py
+/usr/share/apport/package-hooks/firefox.py

 Appends to apport's firefox default report: the files pluginreg.dat and
 profiles.ini, and also a summary of all the extensions loaded on each firefox
@@ -116,7 +116,7 @@

 def add_info(report):
     '''adds hooked info into the apport report.'''
-    config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox-3.6')
+    config_dir = os.path.join(os.environ['HOME'], '.mozilla', 'firefox')
     profiles_d = {}
     # append profiles.ini file & parse it:
     profiles_ini = os.path.join(config_dir,'profiles.ini')

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-12 13:15:16 +0000
+++ debian/changelog	2010-02-15 17:05:20 +0000
@@ -1,5 +1,6 @@
 firefox (3.6+nobinonly-0ubuntu3) UNRELEASED; urgency=low

+  [ Alexander Sack ]
   * fix LP: #520963 - sysprefs not honoured since firefox is built without
     system xulrunner; resurrect the patch we ship in xulrunner
     - add debian/patches/add_syspref_dir.patch
@@ -8,7 +9,13 @@
     distribution.searchplugins.defaultLocale in syspref firefox.js
     - update debian/firefox.js

- -- Alexander Sack <asac@ubuntu.com>  Fri, 12 Feb 2010 13:59:06 +0100
+  [ Micah Gersten ]
+  * Rename apport hook to firefox.py (unversioned)
+    - rename debian/apport/firefox-3.6.py => debian/apport/firefox.py
+  * Update apport hook to pull from unversioned profile directory
+    - update debian/apport/firefox.py
+
+ -- Micah Gersten <micahg@ubuntu.com>  Mon, 15 Feb 2010 11:04:11 -0600

 firefox (3.6+nobinonly-0ubuntu2) lucid; urgency=low