Merge lp://qastaging/~ddecator/songbird/fix-songbird-daily-build-20100416 into lp://qastaging/songbird
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~ddecator/songbird/fix-songbird-daily-build-20100416 |
| Merge into: | lp://qastaging/songbird |
| Diff against target: |
11192 lines (+3860/-2686) 13 files modified
debian/changelog (+2/-2) debian/control (+13/-1) debian/copyright (+174/-3) debian/patches/bz429747_att317495+move_hunspell_1.2.patch (+3546/-2605) debian/patches/bz473629_lp319480_leak_setenv_apprunner.patch (+5/-15) debian/patches/fix_build_glitch.patch (+21/-0) debian/patches/fix_python.patch (+13/-0) debian/patches/fix_ssltunnel_with_system_nss.patch (+8/-16) debian/patches/install_systray.patch (+7/-11) debian/patches/series (+5/-1) debian/patches/sqlite_use_ar_cr.patch (+13/-0) debian/patches/taglib_directory_fix.patch (+13/-0) debian/rules (+40/-32) |
| To merge this branch: | bzr merge lp://qastaging/~ddecator/songbird/fix-songbird-daily-build-20100416 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mozilla Team | Pending | ||
|
Review via email:
|
|||
Unmerged revisions
- 123. By Draycen DeCator
-
* Pull mozbrowser from new location and pull mozexthelper
- update debian/rules - 122. By Draycen DeCator
-
* New upstream snapshot 1.9.0 a SVN 20100708r19138
- 121. By Draycen DeCator
-
From: Mook <email address hidden>
Description: Make debian/rules compliant with songbird.mk no longer checking
environment variables.* Adjust rules file to accomodate changes upstream
- update debian/rules - 120. By Draycen DeCator
-
* Ignore potentially obsolete patch bz429747_
att317495+ move_hunspell_ 1.2.patch
- update debian/patches/ series - 119. By Draycen DeCator
-
* Look for python2.6 instead of python2.5 when building Xulrunner-1.9.2
- add debian/patches/ fix_python. patch - 118. By Draycen DeCator
-
* New upstream snapshot 2.0.0 a SVN 20100624r19027
- 117. By Draycen DeCator
-
* Rebase patches
- update debian/patches/ bz429747_ att317495+ move_hunspell_ 1.2.patch
- update debian/patches/ bz473629_ lp319480_ leak_setenv_ apprunner. patch
- update debian/patches/ fix_build_ glitch. patch
- update debian/patches/ fix_ssltunnel_ with_systen_ nss.patch - 116. By Draycen DeCator
-
* Use 'ar cr' when building SQlite
- add debian/patches/ sqlite_ use_ar_ cr.patch - 115. By Draycen DeCator
-
* Pull and build Xulrunner 1.9.2; Pull and build SQlite; Use bash to address pushd
- update debian/rules - 114. By Draycen DeCator
-
* Check for dependencies of Xulrunner 1.9.2
- update debian/control
