Last commit made on 2014-04-28
Get this branch:
git clone -b ubuntu/utopic-proposed 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

fedd3f8... by Iain Lane on 2014-04-28

Import patches-unapplied version 3.2.6-2ubuntu1 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 26f8605bd1c4984668307414ca1fc9f6c4a36a5d

New changelog entries:
  * Merge with Debian unstable, remaining changes:
    + 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
    + 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
    + debian/patches/0001-Support-s-to-as-migrations-v2.patch: Support 's' to
      'as' migrations
    + debian/patches/call-dbus_g_thread_init.patch
      - Initialize dbus threads before doing anything. This fixes crashes in
        multithreaded applications that don't use libdbus directly.
    + debian/patches/reduce-polling.patch
      - Call the cleanup routine every minute, instead of twice per minute, to
        reduce wakeups and therefore power usage.

26f8605... by Josselin Mouette <email address hidden> on 2014-03-09

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

Imported using git-ubuntu import.

Changelog parent: 05572672e255e723ef3909a802dd2b331a7c7a2e

New changelog entries:
  * gconf-schemas: hide error messages caused by DBus, they are
    Closes: #711597, #711339.
  * Remove gconftool alternative, replace it by proper symlinks.
    Closes: #718277.

0557267... by Michael Biebl on 2013-06-06

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

Imported using git-ubuntu import.

Changelog parent: cbf0df2cd3f3a21507ac5f40590f1f284e2a7aa4

New changelog entries:
  [ Martin Pitt ]
  * Add a simple compile/link/run autopkgtest for libgconf2-dev. Thanks Rafał
    Cieślak! (LP: #1078719)
  * debian/tests/build:
    - Add -Wall -Werror for being more thorough.
    - Don't call deprecated g_type_init() when building with glib >= 2.35.
  [ Michael Biebl ]
  * New upstream release.
    - Fixes use after free in gconf-dbus. Closes: #699424
  * Remove 04_manpage.patch, merged upstream. Refresh other patches.
  * Add symbols file for libgconf-2-4.
  * Bump Standards-Version to 3.9.4. No further changes.
  * Break libgconf2.0-cil < 2.24.2-3. Closes: #694340.

cbf0df2... by Michael Biebl on 2012-04-27

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

Imported using git-ubuntu import.

Changelog parent: dcb161a17b862598563679bf28738f2a9e500636

New changelog entries:
  * New upstream release.
  * Bump Build-Depends on cdbs and debhelper for multiarch support.
  * Bump Build-Depends on libglib2.0-dev to (>= 2.31.0).
  * Drop explicit Build-Depends on gir1.2-glib-2.0.
  * Refresh patches.
  * Bump Standards-Version to 3.9.3.

dcb161a... by Josselin Mouette <email address hidden> on 2012-03-17

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

Imported using git-ubuntu import.

Changelog parent: 21b521610285809425c94020e1b3c2e0efcc9159

New changelog entries:
  * Let libgconf2-4 and libgconf-2-4 break gconf2 << 3.2.3-2 to avoid
    triggering gconf2 while in an inconsistent state. Thanks a lot to
    Steve Langasek for the analysis. Closes: #663167.

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.