Merge lp:~lfaraone/ubufox/lp123713 into lp:~ubuntu-core-dev/ubufox/ubuntu

Proposed by Luke Faraone on 2010-03-19
Status: Rejected
Rejected by: Benjamin Drung on 2010-08-10
Proposed branch: lp:~lfaraone/ubufox/lp123713
Merge into: lp:~ubuntu-core-dev/ubufox/ubuntu
Diff against target: 40 lines (+19/-5)
2 files modified
debian/changelog (+6/-0)
debian/control (+13/-5)
To merge this branch: bzr merge lp:~lfaraone/ubufox/lp123713
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2010-03-19 Pending
Review via email: mp+21729@code.launchpad.net
To post a comment you must log in.
Benjamin Drung (bdrung) wrote :

I merged the version of Vish instead.

Unmerged revisions

110. By Luke Faraone on 2010-03-19

Refactor description per LP: #123713

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-15 21:57:36 +0000
3+++ debian/changelog 2010-03-19 14:53:18 +0000
4@@ -1,3 +1,9 @@
5+ubufox (0.9~b1-0ubuntu3) lucid; urgency=low
6+
7+ * Update description, adapting a patch from ~kecsap. (LP: #123713)
8+
9+ -- Luke Faraone <luke@faraone.cc> Fri, 19 Mar 2010 10:38:14 -0400
10+
11 ubufox (0.9~b1-0ubuntu2) lucid; urgency=low
12
13 * fix LP: #522535 - Apport doesn't recognise Firefox 3.6; add
14
15=== modified file 'debian/control'
16--- debian/control 2009-09-02 07:25:55 +0000
17+++ debian/control 2010-03-19 14:53:18 +0000
18@@ -9,10 +9,18 @@
19 Package: ubufox
20 Architecture: all
21 Depends: firefox | abrowser | firefox-3.0 | firefox-2, apturl (>= 0.1.2ubuntu1) | apturl-kde
22-Description: Ubuntu Firefox specific configuration defaults and apt support
23- Extension package for Firefox provides ubuntu specific configuration defaults
24- as well as apt support for firefox plugins/extensions.
25+Description: Ubuntu Firefox specific changes and apt support
26+ A package for Firefox which modifies the browser to fit the Ubuntu environment.
27+ Specifically, it adds the following things:
28+ * Searching missing plugins from Ubuntu package repositories
29+ * Add the following options to the Help menu
30+ - Report a problem
31+ - Get help on-line
32+ - Help translating firefox
33+ - Ubuntu Release Notes
34+ * Set homepage to Ubuntu Start
35+ * Display a restart notification after upgrading Firefox
36+ * Add ask.com to the search engines.
37 .
38- You can uninstall this package if you prefer to use a pristine firefox
39- install.
40+ Removing this package disables these Ubuntu-specific modifications.
41

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: