Last commit made on 2012-03-23
Get this branch:
git clone -b ubuntu/precise https://git.launchpad.net/ubuntu/+source/gconf
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

4976ba4... by Steve Langasek on 2012-03-23

Import patches-unapplied version 3.2.5-0ubuntu2 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: de901a580ac2af461e3c5fcb1567133f7817cf28

New changelog entries:
  * Split gconf-service further into gconf-service and gconf-service-backend,
    one package being Multi-Arch: foreign and the other Multi-Arch: none, so
    that we correctly handle the fact that gconf2 needs backend modules of
    the same arch whereas other reverse-dependencies just need a working
    daemon. LP: #962854.

de901a5... by Sebastien Bacher on 2012-03-12

Import patches-unapplied version 3.2.5-0ubuntu1 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: 1746f7e0de4b764101ed7a4e7ab1f41e77c6eb54

New changelog entries:
  * New upstream version

1746f7e... by Steve Langasek on 2012-03-09

Import patches-unapplied version 3.2.4-0ubuntu2 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: 009504e9a1e503170c6ee5747e07cd582be3cab3

New changelog entries:
  * libgconf2-4 and libgconf-2-4 should both have a Breaks: against the
    older version of gconf2, to ensure that our trigger is never called
    when gconftool is in an unusable state (due to either missing libraries
    or missing backend DSOs). LP: #948294.

009504e... by Sebastien Bacher on 2012-03-08

Import patches-unapplied version 3.2.4-0ubuntu1 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: fbcbb4ac2f56a3574a83e90fee941bfae6f26d39

New changelog entries:
  * New upstream version

fbcbb4a... by Steve Langasek on 2012-03-05

Import patches-unapplied version 3.2.3-3ubuntu1 to ubuntu/precise

Imported using git-ubuntu import.

Changelog parent: 21b521610285809425c94020e1b3c2e0efcc9159

New changelog entries:
  * Merge from Debian testing, remaining changes:
    - debian/control.in:
      + don't package the gsettings backend since it's not meant to be
    - debian/control.in, debian/rules:
      + use dh-autoreconf
    - debian/patches/02_xml-gettext-domain.patch:
      + use gettext from schemas translations
    - debian/patches/05_nodisplay_autostart.patch:
      + Don't show in "Startup Applications"
    - debian/patches/06_onlyshowin_unity.patch:
      + Add Unity to OnlyShowIn
    - debian/70gconfd_path-on-session, debian/gconf2-common.install:
      + add additional gconf path depending on selected desktop session:
    - debian/gconf-schemas: Shrink the generated %gconf-tree.xml, by
      filtering out locale specific defaults for uninstalled locales,
      leading tabs, empty short descriptions, and mtimes (which aren't
      interesting for system-wide defaults).
    - debian/gconf2.triggers, debian/gconf2.postinst, debian/gconf2.postrm:
      + Declare a new trigger on /usr/share/GConf/gsettings to watch when
        new gsettings convert files are installed.
    - debian/default.path, debian/gconf2-common.dirs:
      + drop old compatibility path from intrepid, that was required until
  * Dropped changes:
    - debian/control.in: no build-dependency on gnome-common, we're using
    - Build using dh_python2: merged in Debian.
    - Mark gconf2 Multi-Arch: foreign: merged in Debian.

21b5216... by Jordi Mallach on 2012-02-26

Import patches-unapplied version 3.2.3-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: fe4cde43155eabf5f47c5dd56704be74dbc140c1

New changelog entries:
  * Let gconf2-common Breaks: libgconf2-4 (<< 3.2.3-2), to avoid partial
    upgrades (closes: #661380).

fe4cde4... by Josselin Mouette <email address hidden> on 2012-02-23

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

Imported using git-ubuntu import.

Changelog parent: 888cca32994ab723dec8423d6fd52afdd98fb7f5

New changelog entries:
  [ Michael Biebl ]
  * debian/libgconf2-dev.install:
    - Remove libtool .la files.
  * debian/control.in:
    - Remove obsolete Conflicts and Replaces.
    - Change section of gir1.2-gconf-2.0 to introspection.
  * Rely on cdbs to call dh_girepository. Bump Build-Depends accordingly.
  * Switch to dh_python2.
  [ Laurent Bigonville ]
  * Add debian/patches/05_readd_gconf_engine_key_is_writable.patch: Add
    missing function in D-Bus variant that causes ABI breakage (Closes: #649112)
  [ Jordi Mallach ]
  * Add a NEWS entry explaining the necessity of a session restart after
    a GConf 2.32 → GConf 3.2 upgrade, due to the ORBit → D-Bus
    transition (closes: #648673).
  [ Josselin Mouette ]
  * Convert to Multi-Arch. Closes: #652861.
    + gconf2, gconf2-common, gconf-defaults-service are M-A: foreign.
    + Move the daemon to a multiarch path.
    + Tighten dependencies.
    + Remove the sanity-check binary, nothing uses it anymore.
      Closes: #649297, #645580.
    + Move the daemon and the activation file to gconf-service, a new
      MA: foreign package.
    + Add appropriate Breaks/Replaces for the activation file.
    + Rename libgconf2-4 to libgconf-2-4, make it MA: same.
    + Make the shlibs add both libgconf-2-4 and gconf-service.
    + Make libgconf2-4 a dummy MA: same package depending on both too.
    + gconf-gsettings-backend is MA: same.
    + Move dbus dependency to gconf-service, make it dbus-x11.
  * Move the API documentation to libgconf2-doc.
  * Get rid of the symlink for documentation.
  * Remove unused gnome-version.mk.
  * gconf-schemas, update-gconf-defaults: don’t purge the environment
    entirely. Closes: #636083.

888cca3... by Josselin Mouette <email address hidden> on 2011-11-12

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

Imported using git-ubuntu import.

Changelog parent: 1ad67be96e718cc588ecd43249c906f4f7c1b793

New changelog entries:
  [ Jeremy Bicha ]
  * New upstream release
  * debian/control.in:
    - Use GTK 3
    - Drop orbit dependency
    - Updated Vcs-Browser link
  * debian/copyright: Fixed lintian warning
  * debian/rules:
    - Explicity disable orbit
  * debian/watch: Switch to .xz tarballs
  * 02_fix_wrong_return_value.patch: Updated
  [ Josselin Mouette ]
  * Split the GSettings backend into a gconf-gsettings-backend package
    that provides gsettings-backend. Closes: #633442.
  * New upstream release.

1ad67be... by Michael Biebl on 2011-06-16

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

Imported using git-ubuntu import.

Changelog parent: 61bb398320d50e2e74463bcf572c949a53c253c8

New changelog entries:
  * New upstream release.

61bb398... by Michael Biebl on 2011-06-03

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

Imported using git-ubuntu import.

Changelog parent: ae351122e07a0650ff078130dde6dee0e862d0c1

New changelog entries:
  * debian/watch: Switch to .bz2 tarballs.
  * Bump debhelper compatibility level to 8.
    - Bump Build-Depends on debhelper.
    - Strip leading debian/tmp/ from .install files.
  * Bump Standards-Version to 3.9.2. No further changes.
  * Update package description. Fix spelling error "allows to" found by
  * Drop Build-Depends on dpkg-dev (>= 1.13.19). Even lenny has a more recent
  * Upload to unstable, drop check-dist include.