ubuntu/+source/gnome-shell:applied/ubuntu/natty

Last commit made on 2010-11-26
Get this branch:
git clone -b applied/ubuntu/natty https://git.launchpad.net/ubuntu/+source/gnome-shell
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/natty
Repository:
lp:ubuntu/+source/gnome-shell

Recent commits

4e21f69... by Chris Coulson on 2010-11-26

Import patches-applied version 2.31.5-2ubuntu3 to applied/ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: 8e3ce2375e1c1a98d923d9485ceea50a066336c2
Unapplied parent: 6b775efee4ef6feb3e1ce03152ced7682eeaeafe

New changelog entries:
  * Don't use xulrunner --gre-version to find the location of libmozjs.so,
    and drop the binary xulrunner depends
    - update debian/patches/04_workaround_libmozjs_build.patch
    - update debian/control
  * Make sure there is a build-depend on xulrunner-dev, as it's used at
    build time (although this normally comes indirectly via gjs)
    - update debian/control

6b775ef... by Chris Coulson on 2010-11-26

Upstream changes introduced in version 2.31.5-2ubuntu3

Gbp-Pq: debian-changes-2.31.5-2ubuntu3.

c2524be... by Chris Coulson on 2010-11-26

04_workaround_libmozjs_build.patch

No DEP3 Subject or Description header found

Gbp-Pq: 04_workaround_libmozjs_build.patch.

4eed26a... by Chris Coulson on 2010-11-26

03_fix_dconf_service_location.diff

No DEP3 Subject or Description header found

Gbp-Pq: 03_fix_dconf_service_location.diff.

b3e2d6c... by Chris Coulson on 2010-11-26

02_undo_gtk3_transition.diff

No DEP3 Subject or Description header found

Gbp-Pq: 02_undo_gtk3_transition.diff.

6d37c5b... by Chris Coulson on 2010-11-26

Import patches-unapplied version 2.31.5-2ubuntu3 to ubuntu/natty

Imported using git-ubuntu import.

Changelog parent: f970299130c2399710cf8d990b4bd9d7e0d8b870

New changelog entries:
  * Don't use xulrunner --gre-version to find the location of libmozjs.so,
    and drop the binary xulrunner depends
    - update debian/patches/04_workaround_libmozjs_build.patch
    - update debian/control
  * Make sure there is a build-depend on xulrunner-dev, as it's used at
    build time (although this normally comes indirectly via gjs)
    - update debian/control

8e3ce23... by Micah Gersten on 2010-09-05

Import patches-applied version 2.31.5-2ubuntu2 to applied/ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: fbb4a6208cc0717b9bdd8dba5c9df473c7b10e6a
Unapplied parent: 3eee8114fb8738f2a97ae6c6d3c46bd3716002e4

New changelog entries:
  * Fix gnome-shell to set LD_LIBRARY_PATH so that libmozjs can be found;
    Don't use pkg-config, use xulrunner-1.9.2 to figure out the path to
    libmozjs (LP: #576991) (LP: #629828)
    - update debian/patches/04_workaround_libmozjs_build.patch
  * Drop binary depends on pkg-config and replace with xulrunner-1.9.2;
    xulrunner-1.9.2 is already pulled in by the depends in any case, but
    now it's needed directly by gnome-shell
    - update debian/control.in

f970299... by Micah Gersten on 2010-09-05

Import patches-unapplied version 2.31.5-2ubuntu2 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: d51cc7f527eb6cefa41f073369f3d4fb571693f0

New changelog entries:
  * Fix gnome-shell to set LD_LIBRARY_PATH so that libmozjs can be found;
    Don't use pkg-config, use xulrunner-1.9.2 to figure out the path to
    libmozjs (LP: #576991) (LP: #629828)
    - update debian/patches/04_workaround_libmozjs_build.patch
  * Drop binary depends on pkg-config and replace with xulrunner-1.9.2;
    xulrunner-1.9.2 is already pulled in by the depends in any case, but
    now it's needed directly by gnome-shell
    - update debian/control.in

3eee811... by Micah Gersten on 2010-09-05

04_workaround_libmozjs_build.patch

No DEP3 Subject or Description header found

Gbp-Pq: 04_workaround_libmozjs_build.patch.

7ccdd2f... by Micah Gersten on 2010-09-05

03_fix_dconf_service_location.diff

No DEP3 Subject or Description header found

Gbp-Pq: 03_fix_dconf_service_location.diff.