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

Last commit made on 2010-11-26
Get this branch:
git clone -b ubuntu/natty-devel 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:
ubuntu/natty-devel
Repository:
lp:ubuntu/+source/gnome-shell

Recent commits

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

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

d51cc7f... by Laurent Bigonville on 2010-08-16

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

Imported using git-ubuntu import.

Changelog parent: ab94d50659ddc4d6495338d2e6a0bbc6e42dedd0

New changelog entries:
  * Merge from debian experimental. Remaining changes:
    - debian/patches/04_workaround_libmozjs_build.patch:
      + workaround build issues due to libmozjs not being installed as a lib
  * Drop debian/patches/01_favorite_apps.diff: Keep firefox as default browser

ab94d50... by Gustavo Noronha Silva on 2010-07-28

Import patches-unapplied version 2.31.5-2 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: d2bb6f4ea4cbc2ac61d533a08b053ffddd386de3

New changelog entries:
  * debian/control:
  - depend and build-depend on gir1.0-glib-2.0 (>= 0.6.15~git20100713)
  - also depend on gjs, because the clock preferences uses gjs-console for
    some reason

d2bb6f4... by Gustavo Noronha Silva <email address hidden> on 2010-07-13

Import patches-unapplied version 2.31.5-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 85be7e7daed91421d37e37df269e43e0c1b1fede

New changelog entries:
  * New development release.
  - depend on mutter 2.31.5
  - refresh patches
  - fixes requirements on mutter (Closes: #586124)
  * debian/control.in:
  - Build-depend on glib >= 2.25.11-1 because we use glib-compile-schemas
  - Build-depend on gtk+ >= 2.21.1
  - Build-depend on gobject-introspection >= 0.6.15~git20100713-1 because
    we need newer glib bindings
  - Build-depend on gir1.0-json-glib-1.0 (Closes: #584660), thanks to
    Raphael Hertzog for pointing out the fix
  - gnome-shell depends on gir1.0-gconf-2.0 >= 2.31.5 to run
  * debian/patches/02_undo_gtk3_transition.diff:
  - undo gtk2->gtk3 migration since we do not yet have gtk+ 3 on Debian
  * debian/patches/03_fix_dconf_service_location.diff:
  - fix the path used to start dconf-service

85be7e7... by Gustavo Noronha Silva <email address hidden> on 2010-05-31

Import patches-unapplied version 2.31.2-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: a23bc7f0a5dd13f2db474c3fd67a3afd14614e87

New changelog entries:
  * New upstream release
  - depends on mutter 2.31
  - includes debian/patches/02_gjs_build_fix.patch, so removing

a23bc7f... by Josselin Mouette <email address hidden> on 2010-04-27

Import patches-unapplied version 2.29.0-3 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: b668b208ff9b6c7e81ff96a9371b3e070d97d840

New changelog entries:
  [ Emilio Pozuelo Monfort ]
  * debian/patches/02_gjs_build_fix.patch:
    - Backport upstream commit to fix the build with recent gjs.
  * debian/source/format,
    debian/patches/series,
    debian/rules:
    - Convert to source format 3.0 (quilt).
  * debian/rules:
    - Include gnome-get-source.mk.

b668b20... by Gustavo Noronha Silva on 2010-03-15

Import patches-unapplied version 2.29.0-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: ae5a400aec1bd355e2a33ea791fe45b75764c9c8

New changelog entries:
  * debian/control:
  - really fix #572718 by bumping the version in mutter's gir package name

ae5a400... by Gustavo Noronha Silva on 2010-03-09

Import patches-unapplied version 2.29.0-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0591bc4c644bb403f549409e95fab40f8ffb7bf0

New changelog entries:
  [ Emilio Pozuelo Monfort ]
  * debian/rules:
    - Don't install *.la.
  [ Gustavo Noronha Silva ]
  * New upstream development release.
  - should work with the newer mutter (Closes: #572718)

0591bc4... by Gustavo Noronha Silva on 2010-01-29

Import patches-unapplied version 2.28.1~git20100129-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 17bbb6e1b00af596364753f47e8ff385407ee628

New changelog entries:
  * New upstream snapshot.