--- gconf2-2.18.0.orig/debian/gconf2.install +++ gconf2-2.18.0/debian/gconf2.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin +debian/gconf-schemas usr/sbin/ +debian/update-gconf-defaults usr/sbin/ +debian/tmp/usr/share/man --- gconf2-2.18.0.orig/debian/update-gconf-defaults +++ gconf2-2.18.0/debian/update-gconf-defaults @@ -0,0 +1,135 @@ +#! /usr/bin/python +# -*- coding: UTF-8 -*- +# +# © 2005 Josselin Mouette +# Licensed under the GNU LGPL, see /usr/share/common-licenses/LGPL-2.1 + + +defaults_dir = '/usr/share/gconf/defaults' +outdir = '/var/lib/gconf/debian.defaults' +treefile = '%gconf-tree.xml' + +import os,tempfile,shutil,sys + +if os.geteuid(): + sys.stderr.write("%s needs to be run as root.\n"%sys.argv[0]) + sys.exit(1) + +tmp_dir=tempfile.mkdtemp(prefix="gconf-") +tmp_home=tmp_dir+'/home' +tmp_gconf=tmp_dir+'/gconf' +tmp_file=tmp_dir+'/temp.entries' + +save_stdout=os.dup(1) +os.close(1) + +def cleanup(): + os.dup2(save_stdout,1) + os.close(save_stdout) + shutil.rmtree(tmp_dir) + +def htmlescape(str): + return str.replace('&','&').replace('>','>').replace('<','<').replace('"','"') + +def int_entry(value): + return ' ' + value + '\n' + +def bool_entry(value): + return ' ' + value + '\n' + +def float_entry(value): + return ' ' + value + '\n' + +def string_entry(value): + return ' ' + htmlescape(value) + '\n' + +def list_entry(value): + ret = ' \n' + for v in value[1:-1].split(','): + ret += ' ' + htmlescape(v) + '\n' + ret += ' \n' + return ret + + +def listcmp(a,b): + """Number of starting similar elements in a and b""" + m = min(len(a),len(b)) + for i in range(m): + if a[i] != b[i]: + return i + return m + +def apply_entries(filename): + res=os.spawnvpe(os.P_WAIT,'gconftool-2', + ['gconftool-2','--direct','--config-source', + 'xml:merged:'+tmp_gconf,'--load',filename], + {'HOME': tmp_home}) + if res: + cleanup() + sys.exit(res) + +gconf_val = {} + +def write_and_apply_entries(filename): + out=file(filename,'w') + out.write('\n\n') + for key in gconf_val: + out.write('\n' + key + '\n\n') + # write the current entry + value = gconf_val[key] + if value[0] == '"' and value[-1] == '"': + out.write(string_entry(value[1:-1])) + elif value in ['true','false']: + out.write(bool_entry(value)) + elif value[0] == '[' and value[-1] == ']': + out.write(list_entry(value)) + elif value.isdigit(): + out.write(int_entry(value)) + else: + try: + float(value) + out.write(float_entry(value)) + except ValueError: + out.write(string_entry(value)) + out.write('\n\n') + out.write('\n\n') + out.close() + apply_entries(filename) + +def read_entries(filename): + for line in file(filename): + l = line.rstrip('\n').split(None,1) + if len(l) == 2: + gconf_val[l[0]] = l[1] + + +defaults_files = os.listdir(defaults_dir) +defaults_files.sort() +for f in defaults_files: + realname=defaults_dir+'/'+f + if f.endswith('.dpkg-tmp'): + pass + elif f.endswith('.entries'): + if gconf_val: + write_and_apply_entries(tmp_file) + gconf_val={} + apply_entries(realname) + else: + read_entries(realname) +if gconf_val: + write_and_apply_entries(tmp_file) + +try: + shutil.copyfile(tmp_gconf+'/'+treefile,outdir+'/'+treefile+'.tmp') + os.rename(outdir+'/'+treefile+'.tmp',outdir+'/'+treefile) +except IOError: + # No %gconf-tree.xml file was created. + try: + os.remove(outdir+'/'+treefile) + except OSError: + # No existing file + pass + +cleanup() + +os.system('kill -s HUP `pidof gconfd-2` >/dev/null 2>&1') --- gconf2-2.18.0.orig/debian/gconf2.prerm +++ gconf2-2.18.0/debian/gconf2.prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" != "upgrade" ]; then + update-alternatives --remove gconftool /usr/bin/gconftool-2 +fi + +#DEBHELPER# --- gconf2-2.18.0.orig/debian/changelog +++ gconf2-2.18.0/debian/changelog @@ -0,0 +1,971 @@ +gconf2 (2.18.0-1ubuntu3) feisty; urgency=low + + * debian/patches/30_broken-g-stat.patch: + - patch from Debian, fix broken gconftool rename logic + * debian/update-gconf-defaults: + - dropped previous workaround + + -- Sebastien Bacher Mon, 5 Mar 2007 15:21:38 +0100 + +gconf2 (2.18.0-1ubuntu2) feisty; urgency=low + + * debian/update-gconf-defaults: + - fix breakage due to gconftool change + + -- Sebastien Bacher Mon, 5 Mar 2007 14:25:38 +0100 + +gconf2 (2.18.0-1ubuntu1) feisty; urgency=low + + * Sync with Debian + * New upstream version: + Misc: + - Make sure error strings are utf-8 + - don't include xml-entry.h twice + - fix leak in gconf meta info code + - remove more popt gunk + - when installing a batch of schema files, don't abort + the entire transaction if one fails + - don't close already closed file descriptors if fdwalk() is available + - use g_file_test instead of gconf_file_test or gconf_file_exists + - remove dead code found from coverity scan + - retain file permissions on gconf database files when + syncing a tree to disk + - Add g_return_val_if_fail checks on type inputs for + gconf_value_new_from_string + * debian/control.in: + - don't require the new gnome-pkg-tools package version from Debian + - the Ubuntu Desktop Team maintains that package + * debian/gconf2.prerm: + - don't remove the alternative on upgrade (Ubuntu: #67698) + * debian/rules: + - don't use the rule to prevent upload to unstable + + -- Sebastien Bacher Mon, 5 Mar 2007 10:54:35 +0100 + +gconf2 (2.18.0-1) experimental; urgency=low + + * New upstream stable release; bug fixes and cleanups. + - Target at experimental for now. + - Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + + -- Loic Minier Sun, 4 Mar 2007 22:19:21 +0100 + +gconf2 (2.16.1-1) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * New upstream stable release; bug fixes and translations. + + -- Loic Minier Mon, 26 Feb 2007 20:40:25 +0100 + +gconf2 (2.16.0-3) unstable; urgency=low + + [ Josselin Mouette ] + * rules: call clean-la.mk. + * Build-depend on gnome-pkg-tools 0.7. + + [ Loic Minier ] + * Fix gconf-schemas to not die with an OSError when gconfd processes die + before being killed or can not be killed, for example when they belong to + a different user. + + -- Loic Minier Fri, 24 Nov 2006 14:26:38 +0100 + +gconf2 (2.16.0-2) unstable; urgency=low + + * Merge the final 2.14.0-5. + * Add CDBS' utils. + * Upload to unstable. + * Ship sample /etc/gconf/2/evoldap.conf as a conffile as we're unlikely to + tweak it a lot for Debian. + * Ship the evoldap LDAP schema in /usr/share/doc/gconf2-common. + * Drop debian/gconftool-2.1; merged upstream. + * Add upstream programming examples to libgconf2-dev. + * Ship upstream doc/FAQ.txt and drop our local debian/FAQ. + + -- Loic Minier Thu, 19 Oct 2006 09:01:48 +0200 + +gconf2 (2.16.0-1) experimental; urgency=low + + * New upstream release; no API change. + - Drop patch 20_gconftool-2-manpage-typo, merged upstream. + - Build-depend on libxml-parser-perl. + + -- Loic Minier Thu, 5 Oct 2006 15:50:05 +0200 + +gconf2 (2.14.0-5) unstable; urgency=medium + + [ Josselin Mouette ] + * Require gnome-pkg-tools 0.6. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Include the gnome-versions.mk snippet. + + [ Loic Minier ] + * Include the mandatory and default paths for desktop-profiles + ($(ENV_MANDATORY_PATH) and $(ENV_DEFAULTS_PATH)); closes: #310065. + * Build-depend on gtk-doc-tools for the devhelp file. + * Build-depend on and libldap2-dev for the evoldap backend. + + -- Loic Minier Tue, 10 Oct 2006 15:51:06 +0200 + +gconf2 (2.14.0-4) unstable; urgency=medium + + * Let update-gconf-defaults ignore .dpkg-tmp files in + /usr/share/gconf/defaults, as it breaks upgrades of packages with .entries + files. + + -- Loic Minier Tue, 8 Aug 2006 12:36:41 +0200 + +gconf2 (2.14.0-3) unstable; urgency=low + + * update-gconf-defaults: better error handling. + + When it isn't run as root. + + When /usr/share/gconf/defaults is empty (closes: #381734). + + -- Josselin Mouette Sun, 6 Aug 2006 23:09:41 +0200 + +gconf2 (2.14.0-2) unstable; urgency=low + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version}. + * Rework update-gconf-defaults to accept .entries files in + /usr/share/gconf/defaults. + * Standards version is 3.7.2. + + [ Loic Minier ] + * Fix {$source:Version} versus ${source:Version}. + * Use ${binary:Version} instead of ${Source-Version} to make package fully + binNMU-safe + * New patch, 20_gconftool-2-manpage-typo, to add missing newline in man + page, thanks Remi Vanicat. + (Closes: #372695) + * Rename gconf_path_max patch to 25_gconf-path-max-hurd. + * Fix watch file. + + -- Josselin Mouette Wed, 2 Aug 2006 23:40:47 +0200 + +gconf2 (2.14.0-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release. + * debian/patches/gconftool_speed.diff: + - dropped; similar change applied upstream. + + J.H.M. Dassen (Ray): + * [debian/control.in] Made glib build dependency explicit and versioned it + following configure.in . + + [ Sjoerd Simons ] + * Updated watch file + + -- Sjoerd Simons Mon, 20 Mar 2006 11:54:58 +0100 + +gconf2 (2.13.5-1) experimental; urgency=low + + * New upstream release. + * 60gconf2_merge-tree: give up on merging the user's home directory by + default, as it can break with NFS servers, including the ones in + Debian. + + gconf2-common.{install,preinst}: remove the file. + + Stop recommending zenity. + + Document that in the README.Debian. + * rules: update shlibs. + + -- Josselin Mouette Sun, 5 Mar 2006 19:15:47 +0100 + +gconf2 (2.12.1-12) unstable; urgency=low + + * gconftool_speed.diff: don't sync after every schema file when using + --makefile-[un]install-rule. This should solve the speed issue. + * gconf-schemas: remove the hack to merge the schemas in a single + file, it should be unnecessary now. + + -- Josselin Mouette Fri, 3 Mar 2006 14:53:31 +0100 + +gconf2 (2.12.1-11) unstable; urgency=low + + * debian/gconf-schemas: + - patch by Gabor Burjan slightly modified, fix the case + where there is no gconfd-2 running + + -- Sebastien Bacher Thu, 2 Mar 2006 17:41:03 +0100 + +gconf2 (2.12.1-10) unstable; urgency=low + + [ Josselin Mouette ] + + * gconf-schemas: + + Complete rewrite, in python. + + Now run gconftool only once, for better performance (closes: #353986). + + Improve performance even further by merging files when there are + several ones. + + -- Sebastien Bacher Thu, 2 Mar 2006 13:47:48 +0100 + +gconf2 (2.12.1-9) unstable; urgency=high + + * The "it's good to parse options, it's better to use them" release. + * gconf-schemas: really uninstall the defaults (closes: #352071). + + -- Josselin Mouette Thu, 9 Feb 2006 17:56:51 +0100 + +gconf2 (2.12.1-8) unstable; urgency=low + + * update-gconf-defaults.8: documentation for update-gconf-defaults. + * gconf2.manpages: ship it. + + -- Josselin Mouette Sun, 8 Jan 2006 11:20:11 +0100 + +gconf2 (2.12.1-7) unstable; urgency=low + + * rules: Pass --as-needed to ld, so that gconf-sanity-check doesn't + get linked with an overly long list of dependencies + (closes: #346375). + + -- Josselin Mouette Sat, 7 Jan 2006 15:14:22 +0100 + +gconf2 (2.12.1-6) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Thu, 5 Jan 2006 07:59:03 +0100 + +gconf2 (2.12.1-5) experimental; urgency=low + + * 60gconf2_merge-tree: if zenity is installed, ask for confirmation + upon login before migrating the gconf tree to %gconf-tree.xml. + * control.in: recommend zenity. + * README.Debian: time to document all the Debian specifities GConf now + has. + * rules: libgconfbackend has moved to libgconf2-4, reflect this for + dh_makeshlibs. + + -- Josselin Mouette Thu, 15 Dec 2005 23:49:03 +0100 + +gconf2 (2.12.1-4) experimental; urgency=high + + * Quote directory and file variables to permit spaces and to compare strings + when they could be empty. (Closes: #339425) + [debian/gconf2.postinst, debian/libgconf2-dev.postinst] + + -- Loic Minier Wed, 16 Nov 2005 09:27:26 +0100 + +gconf2 (2.12.1-3) experimental; urgency=low + + * control.in: really build-depend on python (closes: #338957). + + -- Josselin Mouette Tue, 15 Nov 2005 11:03:15 +0100 + +gconf2 (2.12.1-2) experimental; urgency=low + + * debian/control.in: + - drop version of the build-dependency on libgtk2.0-dev + - fix FTBFS by build-depending on python (Closes: #338957) + + -- Guilherme de S. Pastore Mon, 14 Nov 2005 00:57:45 -0200 + +gconf2 (2.12.1-1) experimental; urgency=low + + * New upstream release. + * gconf2-common.postrm: check for /etc/gconf/2 before removing it + (closes: #335941). + * Merge the gconf directory trees for better performance: + + 60gconf2_merge-tree: new session startup script. This script + forces the rebuild of ~/.gconf. + + gconf2-common.install: install this script in /etc/X11/Xsession.d. + + control.in: depend on psmisc (for killall). + + gconf2.postinst: run gconf-merge-tree on /var/lib/gconf/defaults + if necessary. + + gconf2-common.postrm: entirely purge /var/lib/gconf, + /etc/gconf.xml.defaults and /etc/gconf.xml.mandatory. + + gconf2-common.postinst: the chmod-fixes aren't necessary anymore. + * uupdate: removed, unused. + * Provide a framework to easily set up defaults in Debian packages + (closes: #329340). + + update-gconf-defaults: new script, takes defaults in a specific format + in /usr/share/gconf/defaults and generates a gconf tree in + /var/lib/gconf/debian.defaults. + + gconf2.install: install it. + + control.in: depend on python for its execution. + + rules: run dh_python. + + gconf2-common.dirs: create /var/lib/gconf/debian.defaults and + /usr/share/gconf/defaults, and remove the unused directories + in /usr/share/gconf. + + default.path: remove references to the /usr/share directories, and + reference the brand new /var/lib/gconf/debian.defaults instead. + * Settle for World domination. + + -- Josselin Mouette Sun, 13 Nov 2005 23:05:39 +0100 + +gconf2 (2.12.0-4) experimental; urgency=low + + * Forward some changes in the unstable packages: + * debian/gconf2-common.dirs: + - list "/etc/gconf/2". + * Make the new gconf2 package conflict with the old libgconf2-4 + package, to avoid the case where there is no gconfd-2 binary + installed at all. + * watch: update to 2.12. + * load_empty_dirs.diff: removed, I finally have other projects to + support changing the default values. + + -- Josselin Mouette Sun, 25 Sep 2005 21:33:54 +0200 + +gconf2 (2.12.0-3) experimental; urgency=low + + * gconf2-common.postinst: fix permissions that seem to be set wrong in + some cases. + * load_empty_dirs.diff: load directories even when they are empty. + This should be better for distribution of defaults in Debian + packages. + + -- Josselin Mouette Wed, 21 Sep 2005 20:12:16 +0200 + +gconf2 (2.12.0-2) experimental; urgency=low + + * Remove circular dependency between libgconf2-4 and gconf2 + (closes: #316403). + + move libexecdir to /usr/lib/libgconf2-4, + + new package: gconf2-common, + + move the defaults directories to gconf2-common, + + move the documentation to libgconf2-dev, + + move the configuration file to gconf2-common and handle it with ucf, + + move locale and SGML stuff to gconf2-common. + * Rewrite the package descriptions. + + -- Josselin Mouette Sun, 18 Sep 2005 13:22:59 +0200 + +gconf2 (2.12.0-1) experimental; urgency=low + + * New upstream release. + * rules: bump shlibs version. + * gconf2.postinst: remove bashism. + + -- Josselin Mouette Wed, 14 Sep 2005 22:40:23 +0200 + +gconf2 (2.10.1-2) unstable; urgency=low + + * gconf2.postinst: install the manpage as a slave alternative + (closes: #314999). + * gconf2.{install,links}: install documentation to /usr/share/doc + (closes: #272226). + + rules: don't compress these files. + + gconf2.postinst: make the symlink by hand for the transition. + * rules,control.in: only recommend libgtk2.0-0, for gconf-sanity-check + (closes: #267304). + * Customize the default path file, which now: + - allows to set defaults or mandatory settings in packages; + - sets a place for autogenerated defaults in /var/lib; + - reads user customization files for Sabayon. + (closes: #310065). + + path: the new file. + + gconf2.install: install it in place of the other one. + + gconf2.dirs: create the corresponding directories. + * gconf-schemas: new script, to be used by dh_gconf. + + gconf2.install: install it. + * copyright: update FSF address. + * control.in: bump debhelper dependency to 4.1. + * gconf.devhelp: removed, unused. + * postinst,prerm: renamed to gconf2.{postinst,prerm}. + + -- Josselin Mouette Thu, 8 Sep 2005 01:12:45 +0200 + +gconf2 (2.10.1-1) unstable; urgency=low + + * New upstream release. + + gconfd now exits when unused (closes: #311252). + * gconfd_notify_other_listeners.diff: removed, integrated upstream. + * Set myself as maintainer. + * Standards-version is 3.6.2. + + -- Josselin Mouette Wed, 13 Jul 2005 00:55:47 +0200 + +gconf2 (2.10.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Tue, 7 Jun 2005 20:28:17 +0200 + +gconf2 (2.10.0-1) experimental; urgency=low + + * New upstream release. + * Replaces the .files with .install files. + * debian/compat: + - added. + * debian/gconf2.lintian, debian/libgconf.lintian: + - removed + * debian/FAQ: + - removed iso8859 characters. + * debian/control.in: + - removed packages need for the doc building from Build-Depends since we + don't build it anymore, changed dbs with cdbs. + - added the homepage to descriptions. + * debian/patches/01_default_locale.patch: + - removed, the changes are in the new version. + * debian/rules: + - switched to CDBS. + - turned the doc building off since the html files are provided upstream. + * debian/watch: + - updated. + + -- Sebastien Bacher Thu, 24 Mar 2005 00:53:21 +0100 + +gconf2 (2.8.1-4) unstable; urgency=low + + * debian/patches/01_default_locale.patch: + - fix the problem with default values missing in some locales. + * debian/patches/gconf_path_max.diff: + - patch by Michael Banck to build on hurd. + + -- Sebastien Bacher Sun, 21 Nov 2004 18:25:39 +0100 + +gconf2 (2.8.1-3) unstable; urgency=low + + * gconfd_notify_other_listeners.diff: fix null-pointer free that caused + crashes of gconfd in some cases. + * Removed build-depend on libdb3-dev (closes: #282325). + + -- Josselin Mouette Sun, 21 Nov 2004 14:01:09 +0100 + +gconf2 (2.8.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Wed, 17 Nov 2004 21:23:26 +0100 + +gconf2 (2.8.1-1) experimental; urgency=low + + * New upstream release. + * [debian/watch] Updated. + + -- J.H.M. Dassen (Ray) Tue, 12 Oct 2004 19:53:53 +0200 + +gconf2 (2.8.0-1) experimental; urgency=low + + * New upstream release. + * [debian/control.in] Removed gtk-doc-tools, docbook-xml build dependencies; + we just use the HTML docs from the upstream tarball. + Added explicit autoconf, autotools-dev build dependencies. + * [debian/rules] configure --disable-gtk-doc . + + -- J.H.M. Dassen (Ray) Tue, 14 Sep 2004 18:56:58 +0200 + +gconf2 (2.7.92-1) experimental; urgency=low + + * New upstream development release. + + -- J.H.M. Dassen (Ray) Mon, 30 Aug 2004 14:22:59 +0200 + +gconf2 (2.7.91.1-1) experimental; urgency=low + + * New upstream development release. + + -- J.H.M. Dassen (Ray) Fri, 20 Aug 2004 18:12:41 +0200 + +gconf2 (2.7.91-1) experimental; urgency=low + + * New upstream development release. + * [debian/control.in] Moved the devel package to the `libdevel' section. + + -- J.H.M. Dassen (Ray) Tue, 17 Aug 2004 19:59:12 +0200 + +gconf2 (2.7.90-1) experimental; urgency=low + + * New upstream development release. + * [debian/rules] Ensure at build time all symbols are resolvable; make the + linker work a bit harder so dynamic loading can be done faster. + * [patches/gnu_os_maxpathlen_fix.diff] Disabled as it no longer applies + cleanly. + * [debian/shlibs.local] Bumped just in case. + + -- J.H.M. Dassen (Ray) Sun, 15 Aug 2004 10:45:26 +0200 + +gconf2 (2.7.1-1) experimental; urgency=low + + * GNOME Team Upload. + * New (development) upstream release. + + -- Marc 'HE' Brockschmidt Sat, 19 Jun 2004 17:00:55 +0200 + +gconf2 (2.6.1-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable + + -- Sebastien Bacher Tue, 25 May 2004 19:57:37 +0200 + +gconf2 (2.6.1-1) experimental; urgency=low + + * New upstream release. + + -- Sebastien Bacher Tue, 20 Apr 2004 19:23:36 +0200 + +gconf2 (2.6.0-2) experimental; urgency=low + + * Added Build-Depends on docbook-xml (Closes: #240184). + + -- Sebastien Bacher Wed, 31 Mar 2004 23:05:55 +0200 + +gconf2 (2.6.0-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + + updated Build-Depends. + * debian/libgconf2-2.substvars: + + removed. + + -- Sebastien Bacher Tue, 23 Mar 2004 23:32:26 +0100 + +gconf2 (2.4.0.1-3) unstable; urgency=low + + * debian/control.in: + + update for the Gnome Team. + * debian/gconf.devhelp: + + include this file to have the API available in devhelp. + * debian/gconftool-2.1: + + include manpage from the CVS (Closes: #178887). + * debian/rules: + + change dh_installmanpages for dh_installman. + + install the devhelp file. + + remove dh_undocumented call. + + update for the Gnome Team. + + use --enable-gtk-doc to generate the missing doc (Closes: #203645). + + -- Sebastien Bacher Thu, 1 Jan 2004 16:14:15 +0100 + +gconf2 (2.4.0.1-2) unstable; urgency=low + + * Fix Build-Depends : liborbit2-dev (2.8.0, should be 1:2.8.0). + + -- Sebastien Bacher Sat, 18 Oct 2003 02:53:23 +0200 + +gconf2 (2.4.0.1-1) unstable; urgency=low + + * New upstream release + * GNOME Team upload + + -- Sebastien Bacher Wed, 15 Oct 2003 18:36:26 +0200 + +gconf2 (2.2.1-4) unstable; urgency=low + + * Build-Depends on gtk2 again. + It is necessary to build gconf-sanity-check-2 (close: #213437) + + -- Takuo KITAME Thu, 2 Oct 2003 12:28:51 +0900 + +gconf2 (2.2.1-3) unstable; urgency=low + + * Fix again postinst (closes: #208600, #208611, #208604) + + -- Takuo KITAME Thu, 4 Sep 2003 10:13:16 +0900 + +gconf2 (2.2.1-2) unstable; urgency=low + + * Fix postinst (closes: #205703) + * remove libgtk2.0-dev from Build-Depends, it is not needed. + and fix configure (closes: #187700) + * remove symlink to manpage which does not exist(closes: #198857) + * register gconf-1.0.dtd (closes: #177905) + + -- Takuo KITAME Wed, 3 Sep 2003 17:08:44 +0900 + +gconf2 (2.2.1-1) unstable; urgency=low + + * New upstream release + * applied PATH_MAX patch for GNU/Hurd (closes: #164583) + * Build-Depends on libgtk2.0-dev (closes: #187700) + * maintainer upload, closes NMU fixes (closes: #172387, #172388, #175309, #175515) + * fix description (closes: #189515) + + -- Takuo KITAME Tue, 17 Jun 2003 12:31:34 +0900 + +gconf2 (2.2.0-1) unstable; urgency=low + + * New upstream release + * Fix build-depends (closes: #177743, #177768) + + -- Takuo KITAME Wed, 22 Jan 2003 12:19:55 +0900 + +gconf2 (2.1.90-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 20 Jan 2003 11:58:41 +0900 + +gconf2 (1.2.1-4) unstable; urgency=low + + * Update config.{guess,sub} + * change Maintainer address to @debian.org + + -- Takuo KITAME Wed, 13 Nov 2002 14:44:43 +0900 + +gconf2 (1.2.1-3) unstable; urgency=low + + * Maintainer upload. (closes: #156240, #149733) + Thanks to Michael and Christian's NMU + * fix shlibs. include version number + * Conflict with older libgconf11 versions which expected gconfd-2 in /usr/bin. + + -- Takuo KITAME Mon, 26 Aug 2002 15:45:01 +0900 + +gconf2 (1.2.1-2.1) unstable; urgency=low + + * NMU + * Really fix 156240. Those binaries should go in /usr/lib/gconf2 and not + /usr/bin (Closes: #156240) + * Build with --disable-gtk-doc Documentation already generated by + upstream. + * Remove debian/libgconf2.postinst This file contains a ldconfig call not + needed with DH_COMPAT=3 + * debian/rules remove not needed double dh_makeshlibs calls and make a + versioned gconf2 dependency for libgconf2-4 to really fix #149733. + + -- Christian Marillat Thu, 22 Aug 2002 18:58:46 +0200 + +gconf2 (1.2.1-2) unstable; urgency=low + + * configure with --libexecdir=\$${prefix}/bin (closes: #156240) + + -- Takuo KITAME Fri, 16 Aug 2002 15:40:35 +0900 + +gconf2 (1.2.1-1) unstable; urgency=low + + * New upstream release + * build against libgtk2.0-0png3 + + -- Takuo KITAME Thu, 8 Aug 2002 12:37:14 +0900 + +gconf2 (1.2.0-1) unstable; urgency=low + + * New upstream release + * libgconf2-4: change shlibs to gconf2 (>= ${VERSION}) + Package will depends on gconf2 instead of libgconf2, + No problems, gconf2 depends on versioned libgconf2. (closes: #149733) + + -- Takuo KITAME Thu, 13 Jun 2002 03:07:55 +0900 + +gconf2 (1.1.11-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 4 Jun 2002 00:13:36 +0900 + +gconf2 (1.1.10-2) unstable; urgency=low + + * move /usr/lib/GConf/2/libgconfbackend-xml.so into gconf2 (closes: #148136) + + -- Takuo KITAME Fri, 31 May 2002 15:53:49 +0900 + +gconf2 (1.1.10-1) unstable; urgency=low + + * New upstream release + * use dbs + + -- Takuo KITAME Wed, 1 May 2002 09:47:52 +0900 + +gconf2 (1.1.9-2) unstable; urgency=low + + * fix place of Documentation (closes: #140782) + * includes FAQ and README.Debian + + -- Takuo KITAME Tue, 23 Apr 2002 12:36:11 +0900 + +gconf2 (1.1.9-1) unstable; urgency=low + + * New upstream release + * bug fixed by upstrem. + closes: #138188 Can't deal with locales not specified in the schema file + + -- Takuo KITAME Mon, 1 Apr 2002 06:18:50 +0900 + +gconf2 (1.1.8-6) unstable; urgency=high + + * fix bashism in postrm (closes: #140133, #140221) + + -- Takuo KITAME Thu, 28 Mar 2002 11:33:57 +0900 + +gconf2 (1.1.8-5) unstable; urgency=low + + * build against glib2.0 (closes: #139611) + + -- Takuo KITAME Thu, 21 Mar 2002 00:32:52 +0900 + +gconf2 (1.1.8-4) unstable; urgency=low + + * build against libgtk1.3-15 + * debian/gconf2.postrm: + - rmdir -p /etc/gconf/2 on purge (closes: #135687) + + -- Takuo KITAME Tue, 26 Feb 2002 13:09:39 +0900 + +gconf2 (1.1.8-3) unstable; urgency=low + + * build against libgtk1.3-14 + + -- Takuo KITAME Fri, 22 Feb 2002 20:48:34 +0900 + +gconf2 (1.1.8-2) unstable; urgency=low + + * build against libatk12 + + -- Takuo KITAME Fri, 15 Feb 2002 10:18:31 +0900 + +gconf2 (1.1.8-1) unstable; urgency=low + + * New upstream release + * libgconf2-dev depends on liborbit2-dev (closes: #133630) + * build against libatk11 + + -- Takuo KITAME Wed, 13 Feb 2002 14:32:23 +0900 + +gconf2 (1.1.7-3) unstable; urgency=low + + * build against new linc and ORBit2 + + -- Takuo KITAME Mon, 11 Feb 2002 22:26:43 +0900 + +gconf2 (1.1.7-2) unstable; urgency=low + + * change soname to 4 + + -- Takuo KITAME Fri, 8 Feb 2002 05:05:07 +0900 + +gconf2 (1.1.7-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 6 Feb 2002 01:13:05 +0900 + +gconf2 (1.1.6-2) unstable; urgency=low + + * Build against libglib1.3-13 + * update Build-Depends: libglib1.3-dev (>= 1.3.13) + + -- Takuo KITAME Sun, 3 Feb 2002 23:36:56 +0900 + +gconf2 (1.1.6-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 18 Jan 2002 20:59:27 +0000 + +gconf2 (1.1.5-2) unstable; urgency=low + + * build against latest libraries. + * update Build-Depends. + + -- Takuo KITAME Tue, 8 Jan 2002 10:01:24 +0000 + +gconf2 (1.1.5-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 2 Jan 2002 10:39:56 +0000 + +gconf2 (1.1.4-6) unstable; urgency=low + + * debian/control: + - Fix Build-Depends: line and add 'indent' (closes: #126581) + + -- Takuo KITAME Thu, 27 Dec 2001 06:14:23 +0000 + +gconf2 (1.1.4-5) unstable; urgency=low + + * debian/control: + - fixed typo in description (closes: #124952) + + -- Takuo KITAME Mon, 17 Dec 2001 23:45:27 +0000 + +gconf2 (1.1.4-4) unstable; urgency=low + + * fix build-depends, again (closes: #122995) + + -- Takuo KITAME Sun, 9 Dec 2001 03:30:49 +0000 + +gconf2 (1.1.4-3) unstable; urgency=low + + * Build against new glib1.3.11 + * fix glib-object.h problem. + * Build-Depends: liborbit2-dev (>= 2.3.99) (closes: #122263) + + -- Takuo KITAME Fri, 7 Dec 2001 20:48:19 +0000 + +gconf2 (1.1.4-2) unstable; urgency=low + + * fix build-depends. (closes: #121554) + + -- Takuo KITAME Wed, 28 Nov 2001 15:53:43 +0000 + +gconf2 (1.1.4-1) unstable; urgency=low + + * New upstream release + * Build against glib1.3.10 + + -- Takuo KITAME Tue, 13 Nov 2001 00:11:10 +0000 + +gconf2 (1.1.3-1) unstable; urgency=low + + * New upstream release + * New package name gconf2, libgconf2, libgconf2-dev + + -- Takuo KITAME Fri, 26 Oct 2001 04:30:43 +0000 + +gconf (1.0.6-3) unstable; urgency=low + + * g_utf8_validate renamed to gconf_g_utf8_validate (It is internal!!) + comment out unused g_utf8_skip + It'll fix Evolution(Summary) with gconf 1.0.6. (closes: #116423) + + -- Takuo KITAME Mon, 22 Oct 2001 19:39:59 +0900 + +gconf (1.0.6-2) unstable; urgency=low + + * Fixed postinst (closes: #116176, #116177, #116178, #116179) + + -- Takuo KITAME Fri, 19 Oct 2001 12:25:55 +0900 + +gconf (1.0.6-1) unstable; urgency=low + + * New upstream release + * fixed wrong URL in README (closes: #112000) + * fix permission of /etc/gconf/gconf.xml.defaults (closes: #112875, #115920) + + -- Takuo KITAME Thu, 18 Oct 2001 10:01:17 +0900 + +gconf (1.0.5-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 15 Oct 2001 13:35:23 +0900 + +gconf (1.0.4-3) unstable; urgency=low + + * libgconf-dev: depends liboaf-dev (closes: #111251) + + -- Takuo KITAME Fri, 7 Sep 2001 21:35:36 +0900 + +gconf (1.0.4-2) unstable; urgency=low + + * rebuild with latest oaf. It will be fix Bug#110874. (closes: Bug#110874) + + -- Takuo KITAME Sun, 2 Sep 2001 01:20:31 +0900 + +gconf (1.0.4-1) unstable; urgency=low + + * New upstream release (closes: Bug#109689) + + -- Takuo KITAME Fri, 24 Aug 2001 02:30:51 +0900 + +gconf (1.0.3-2) unstable; urgency=low + + * install /etc/gconf/gconf.xml.mandatory (closes: Bug#108054) + + -- Takuo KITAME Thu, 9 Aug 2001 00:48:00 +0900 + +gconf (1.0.3-1) unstable; urgency=low + + * New upstream release + * include gconf.xml.defaults (closes: Bug#105894) + * include /etc/gconf/1/ (closes: Bug#105896) + * rm -rf /etc/gconf when purge gconf (closes: Bug#104415) + + -- Takuo KITAME Tue, 7 Aug 2001 03:55:17 +0900 + +gconf (1.0.1-3) unstable; urgency=low + + * update config.{guess,sub} (closes: Bug#103376) + + -- Takuo KITAME Sun, 8 Jul 2001 19:06:37 +0900 + +gconf (1.0.1-2) unstable; urgency=low + + * escape gnome-config checks in configure.in. + It's not needed, I think. (closes: Bug#98350) + + -- Takuo KITAME Sun, 27 May 2001 16:50:45 +0900 + +gconf (1.0.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Sun, 20 May 2001 04:16:32 +0900 + +gconf (1.0.0-4) unstable; urgency=low + + * debian/control: fix description. (closes: Bug#94179) + + -- Takuo KITAME Thu, 19 Apr 2001 03:07:13 +0900 + +gconf (1.0.0-3) unstable; urgency=low + + * Build-Depends: added versionned libguile-dev (>= 1:1.4-10) (closes: Bug#93101) + * Built with libdb3 (closes: Bug#93192, Bug#93185) + + -- Takuo KITAME Sun, 8 Apr 2001 13:59:35 +0900 + +gconf (1.0.0-2) unstable; urgency=low + + * fix Build-Depends zlib1g-dev (closes: Bug#90380) + + -- Takuo KITAME Thu, 22 Mar 2001 13:12:36 +0900 + +gconf (1.0.0-1) unstable; urgency=low + + * New upstream release + * fix Build-Depends libgtk1.2-dev. (closes: Bug#89567) + + -- Takuo KITAME Wed, 14 Mar 2001 12:07:30 +0900 + +gconf (0.50-2) unstable; urgency=low + + * libgconf-dev: Depends on gconf (= ${Source-Version}) (closes: Bug#89309) + * --disable-debug (closes: Bug#81210) + + -- Takuo KITAME Tue, 13 Mar 2001 19:00:54 +0900 + +gconf (0.50-1) unstable; urgency=low + + * New upstream release + * libguile-dev is now availeable, Build-Depends: libguile-dev is right. (closes: Bug#84454) + * gconf binaries are now in own package 'gconf'. + + -- Takuo KITAME Wed, 28 Feb 2001 12:11:35 +0900 + +gconf (0.12-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 1 Feb 2001 13:13:38 +0900 + +gconf (0.11-2) unstable; urgency=low + + * debian/control: Build-Depends (closes: Bug#77623) + + -- Takuo KITAME Wed, 22 Nov 2000 09:02:56 +0900 + +gconf (0.11-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Sun, 29 Oct 2000 03:54:31 +0900 + +gconf (0.10-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 11 Oct 2000 09:47:19 +0900 + +gconf (0.8-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 18 Aug 2000 05:47:20 +0900 + +gconf (0.5.000512-1) unstable; urgency=low + + * Initial Release. + + -- Vincent Renardias Mon, 15 May 2000 17:43:46 +0200 + --- gconf2-2.18.0.orig/debian/rules +++ gconf2-2.18.0/debian/rules @@ -0,0 +1,28 @@ +#! /usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +GNOME_MODULE := GConf + +DEB_INSTALL_DOCS_gconf2 := doc/FAQ.txt NEWS README TODO +DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed" +DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4 + +DEB_DH_MAKESHLIBS_ARGS_libgconf2-4 := -Xbackend -V"libgconf2-4 (>= 2.13.5)" +DEB_DH_SHLIBDEPS_ARGS := -Xgconf-sanity-check + +DEB_COMPRESS_EXCLUDE := usr/share/doc/gconf2/html + +binary-predeb/gconf2:: + dh_python -pgconf2 + +clean:: + -rm -rf doc/gconf/.libs --- gconf2-2.18.0.orig/debian/default.path +++ gconf2-2.18.0/debian/default.path @@ -0,0 +1,52 @@ +###################### +# 1. Forced settings # +###################### + +# Settings forced by the local administrator +xml:readonly:/etc/gconf/gconf.xml.mandatory + +# Other forced sources imagined by the local administrator +include /etc/gconf/2/local-mandatory.path + + +####################### +# 2. User Preferences # +####################### + +# mandatory path for sabayon +include "$(HOME)/.gconf.path.mandatory" + +# mandatory path for desktop-profiles +include $(ENV_MANDATORY_PATH) + +# Other sources imagined by the user +include "$(HOME)/.gconf.path" + +# The default storage location, ~/.gconf +# This should be the only readwrite source +xml:readwrite:$(HOME)/.gconf + +# default path for sabayon +include "$(HOME)/.gconf.path.defaults" + +# default path for desktop-profiles +include $(ENV_DEFAULTS_PATH) + + +###################### +# 3. System defaults # +###################### + +# Other default sources imagined by the local administrator +include /etc/gconf/2/local-defaults.path + +# System administrator's defaults. This source also serves as a legacy +# source for packages not using a recent dh_gconf, or for applications +# installed by hand. +xml:readonly:/etc/gconf/gconf.xml.defaults + +# Debian branding, including CDD or packaged branding +xml:readonly:/var/lib/gconf/debian.defaults + +# Upstream application defaults +xml:readonly:/var/lib/gconf/defaults --- gconf2-2.18.0.orig/debian/control +++ gconf2-2.18.0/debian/control @@ -0,0 +1,71 @@ +Source: gconf2 +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Kilian Krause , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +Build-Depends: debhelper (>> 4.1.0), cdbs, libglib2.0-dev (>= 2.9), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev, zlib1g-dev, gettext, gcc (>= 3:3.2.2), libgtk2.0-dev, gnome-pkg-tools (>= 0.9), dpkg-dev (>= 1.13.19), python (>= 2.3), libldap2-dev, gtk-doc-tools, libxml-parser-perl +Standards-Version: 3.7.2 + +Package: gconf2 +Architecture: any +Depends: ${shlibs:Depends}, gconf2-common (>= ${gnome:Version}), gconf2-common (<< ${gnome:NextVersion}), psmisc, ${python:Depends} +Recommends: libgtk2.0-0 +Conflicts: libgconf2-4 (<< 2.12.0-2) +Description: GNOME configuration database system (support tools) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the command line tools: gconftool and + gconf-merge-tree. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: gconf2-common +Architecture: all +Depends: ${misc:Depends}, ucf +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (common files) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the default configuration and localization files. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-4 +Architecture: any +Depends: ${shlibs:Depends}, gconf2-common (>= ${gnome:Version}), gconf2-common (<< ${gnome:NextVersion}) +Description: GNOME configuration database system (shared libraries) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the shared libraries and the GConf daemon. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-dev +Section: libdevel +Architecture: any +Depends: libgconf2-4 (= ${binary:Version}), libglib2.0-dev, libpopt-dev, liborbit2-dev (>= 1:2.8.0), gconf2 (= ${binary:Version}) +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (development) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the static libraries, header files and + documentation needed to build applications using GConf. + . + Homepage: http://www.gnome.org/projects/gconf/ --- gconf2-2.18.0.orig/debian/compat +++ gconf2-2.18.0/debian/compat @@ -0,0 +1,2 @@ +4 + --- gconf2-2.18.0.orig/debian/control.in +++ gconf2-2.18.0/debian/control.in @@ -0,0 +1,71 @@ +Source: gconf2 +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>> 4.1.0), cdbs, libglib2.0-dev (>= 2.9), liborbit2-dev (>= 1:2.10.2-1.1), libpopt-dev, libxml2-dev, zlib1g-dev, gettext, gcc (>= 3:3.2.2), libgtk2.0-dev, gnome-pkg-tools (>= 0.9), dpkg-dev (>= 1.13.19), python (>= 2.3), libldap2-dev, gtk-doc-tools, libxml-parser-perl +Standards-Version: 3.7.2 + +Package: gconf2 +Architecture: any +Depends: ${shlibs:Depends}, gconf2-common (>= ${gnome:Version}), gconf2-common (<< ${gnome:NextVersion}), psmisc, ${python:Depends} +Recommends: libgtk2.0-0 +Conflicts: libgconf2-4 (<< 2.12.0-2) +Description: GNOME configuration database system (support tools) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the command line tools: gconftool and + gconf-merge-tree. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: gconf2-common +Architecture: all +Depends: ${misc:Depends}, ucf +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (common files) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the default configuration and localization files. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-4 +Architecture: any +Depends: ${shlibs:Depends}, gconf2-common (>= ${gnome:Version}), gconf2-common (<< ${gnome:NextVersion}) +Description: GNOME configuration database system (shared libraries) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the shared libraries and the GConf daemon. + . + Homepage: http://www.gnome.org/projects/gconf/ + +Package: libgconf2-dev +Section: libdevel +Architecture: any +Depends: libgconf2-4 (= ${binary:Version}), libglib2.0-dev, libpopt-dev, liborbit2-dev (>= 1:2.8.0), gconf2 (= ${binary:Version}) +Replaces: gconf2 (<< 2.12.0-2) +Description: GNOME configuration database system (development) + GConf is a configuration database system for storing application + preferences. It supports default or mandatory settings set by the + administrator, and changes to the database are instantly applied to all + running applications. It is written for the GNOME desktop but doesn't + require it. + . + This package contains the static libraries, header files and + documentation needed to build applications using GConf. + . + Homepage: http://www.gnome.org/projects/gconf/ --- gconf2-2.18.0.orig/debian/patches/30_broken-g-stat.patch +++ gconf2-2.18.0/debian/patches/30_broken-g-stat.patch @@ -0,0 +1,52 @@ +diff -Nur gconf2-2.18.0/backends/markup-tree.c gconf2-2.18.0.new/backends/markup-tree.c +--- gconf2-2.18.0/backends/markup-tree.c 2007-03-05 15:14:17.000000000 +0100 ++++ gconf2-2.18.0.new/backends/markup-tree.c 2007-03-05 15:16:30.000000000 +0100 +@@ -4495,8 +4495,22 @@ + target_renamed = (g_rename (filename, tmp_filename) == 0); + #endif + +- if (g_stat (filename, &st) != 0) +- goto out; ++#ifndef G_OS_WIN32 ++ if (g_stat (filename, &st) == 0) { ++ /* Restore permissions. There is not much error checking we can do ++ * here. The final data is saved anyways. Note the order: ++ * mode, uid+gid, gid, uid, mode. ++ */ ++ chmod (new_filename, st.st_mode); ++ if (chown (new_filename, st.st_uid, st.st_gid) < 0) ++ { ++ /* We cannot set both. Maybe we can set one. */ ++ chown (new_filename, -1, st.st_gid); ++ chown (new_filename, st.st_uid, -1); ++ } ++ chmod (new_filename, st.st_mode); ++ } ++#endif + + if (g_rename (new_filename, filename) < 0) + { +@@ -4508,23 +4522,6 @@ + #endif + goto out; + } +-#ifndef G_OS_WIN32 +- else +- { +- /* Restore permissions. There is not much error checking we can do +- * here. The final data is saved anyways. Note the order: +- * mode, uid+gid, gid, uid, mode. +- */ +- chmod (filename, st.st_mode); +- if (chown (filename, st.st_uid, st.st_gid) < 0) +- { +- /* We cannot set both. Maybe we can set one. */ +- chown (filename, -1, st.st_gid); +- chown (filename, st.st_uid, -1); +- } +- chmod (filename, st.st_mode); +- } +-#endif + + #ifdef G_OS_WIN32 + if (target_renamed) --- gconf2-2.18.0.orig/debian/patches/25_gconf-path-max-hurd.patch +++ gconf2-2.18.0/debian/patches/25_gconf-path-max-hurd.patch @@ -0,0 +1,30 @@ +diff -Naur GConf-2.6.4.orig/backends/markup-tree.c GConf-2.6.4/backends/markup-tree.c +--- GConf-2.8.1.orig/backends/markup-tree.c 2004-09-29 14:09:44.000000000 +0200 ++++ GConf-2.8.1/backends/markup-tree.c 2004-09-29 14:14:01.000000000 +0200 +@@ -33,6 +33,11 @@ + #include + #include + ++/* PATH_MAX is not defined in limits.h on some platforms */ ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + typedef struct + { + char *locale; +diff -Naur GConf-2.6.4.orig/backends/xml-dir.c GConf-2.6.4/backends/xml-dir.c +--- GConf-2.8.1.orig/backends/xml-dir.c 2004-09-29 14:09:44.000000000 +0200 ++++ GConf-2.8.1/backends/xml-dir.c 2004-09-29 14:11:59.000000000 +0200 +@@ -37,6 +37,11 @@ + #include + #include "xml-entry.h" + ++/* PATH_MAX is not defined in limits.h on some platforms */ ++#ifndef PATH_MAX ++#define PATH_MAX 4096 ++#endif ++ + /* This makes hash table safer when debugging */ + #ifndef GCONF_ENABLE_DEBUG + #define safe_g_hash_table_insert g_hash_table_insert --- gconf2-2.18.0.orig/debian/libgconf2-dev.install +++ gconf2-2.18.0/debian/libgconf2-dev.install @@ -0,0 +1,7 @@ +debian/tmp/usr/include +debian/tmp/usr/lib/*.so +debian/tmp/usr/lib/*.a +debian/tmp/usr/lib/*.la +debian/tmp/usr/share/aclocal +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/share/gtk-doc/html/gconf/* usr/share/doc/gconf2/html/ --- gconf2-2.18.0.orig/debian/gconf2-common.postinst +++ gconf2-2.18.0/debian/gconf2-common.postinst @@ -0,0 +1,6 @@ +#! /bin/sh +set -e + +ucf /usr/share/gconf/default.path /etc/gconf/2/path + +#DEBHELPER# --- gconf2-2.18.0.orig/debian/update-gconf-defaults.8 +++ gconf2-2.18.0/debian/update-gconf-defaults.8 @@ -0,0 +1,57 @@ +.TH UPDATE-GCONF-DEFAULTS 8 "8 Jan 2006" +.\" Please adjust this date whenever revising the manpage. +.SH NAME +update-gconf-defaults \- generate GConf defaults shipped in Debian packages +.SH SYNOPSIS +.B update-gconf-defaults +.SH DESCRIPTION +This manual page documents briefly the +.B update-gconf-defaults +command. +.PP +.B update-gconf-defaults +is responsible for generating defaults used by GConf from the files +found in +.IR /usr/share/gconf/defaults . +.PP +The syntax of files in this directory consists in lines containing the +key name, some white space, and the key value, which can be an integer, +a boolean, a float, a string or a list of strings. Example: +.PP +/apps/myprogram/frob_number 42 +.br +/apps/myprogram/do_foo true +.br +/apps/myprogram/priority 1.25 +.br +/apps/myprogram/name "Gotcha !" +.br +/apps/myprogram/names [Ha ha!,Let's keep serious,Ho ho!] +.PP +Files are processed in alphabetical order. Files processed later take +precedence over the previous ones if they include the same defaults. +Thus, it is recommended to name +them +.IR NN _ package +with +.I NN +being a 2-digit number and +.I package +the package name. It is recommended to set +.I NN +as 10 for packages in the Debian archive, 20 for derived distributions, +50 for CDD distributions, and 90 for site-specific packages. +.SH OPTIONS +There are no options for this program. +.SH FILES +.TP +.I /usr/share/gconf/defaults/ +The directory where defaults files are read. +.TP +.I /var/lib/gconf/debian.defaults/%gconf-tree.xml +The value tree generated. It is read by GConf with the default Debian +configuration, and it takes precedence over upstream defaults. +.SH SEE ALSO +.BR dh_gconf (1), gconftool (1). +.SH AUTHOR +Josselin Mouette . --- gconf2-2.18.0.orig/debian/gconf2-common.postrm +++ gconf2-2.18.0/debian/gconf2-common.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ];then + if [ -x /usr/bin/ucf ]; then + ucf --purge /etc/gconf/2/path + fi + if [ -d /etc/gconf/2 ]; then + rm -f /etc/gconf/2/path + rmdir -p --ignore-fail-on-non-empty /etc/gconf/2 + fi + rm -rf /var/lib/gconf + rm -rf /etc/gconf/gconf.xml.mandatory + rm -rf /etc/gconf/gconf.xml.defaults +fi + +#DEBHELPER# --- gconf2-2.18.0.orig/debian/gconf2-common.preinst +++ gconf2-2.18.0/debian/gconf2-common.preinst @@ -0,0 +1,24 @@ +#! /bin/sh +set -e + +# Remove a no-longer used conffile +rm_conffile() { + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +rm_conffile /etc/X11/Xsession.d/60gconf2_merge-tree + +#DEBHELPER# --- gconf2-2.18.0.orig/debian/watch +++ gconf2-2.18.0/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/GConf/([\d\.]+)[02468]/GConf-([\d\.]+)\.tar\.gz --- gconf2-2.18.0.orig/debian/default.path.md5sum +++ gconf2-2.18.0/debian/default.path.md5sum @@ -0,0 +1,2 @@ +9f90335546f7c57ae6fb552cc2b919c5 2.8.1-6 +65faa85aca651fa9313cb78e0915d392 2.12.0-1 --- gconf2-2.18.0.orig/debian/libgconf2-dev.examples +++ gconf2-2.18.0/debian/libgconf2-dev.examples @@ -0,0 +1 @@ +examples/*.c --- gconf2-2.18.0.orig/debian/gconf2.postinst +++ gconf2-2.18.0/debian/gconf2.postinst @@ -0,0 +1,28 @@ +#!/bin/sh + +set -e + +update-alternatives \ + --install /usr/bin/gconftool gconftool /usr/bin/gconftool-2 25 \ + --slave /usr/share/man/man1/gconftool.1.gz gconftool.1.gz \ + /usr/share/man/man1/gconftool-2.1.gz + +#DEBHELPER# + +for GCONF_DIR in /var/lib/gconf/defaults \ + /etc/gconf/gconf.xml.mandatory \ + /etc/gconf/gconf.xml.defaults ; do + GCONF_TREE=$GCONF_DIR/%gconf-tree.xml + if [ ! -f "$GCONF_TREE" ]; then + gconf-merge-tree "$GCONF_DIR" + chmod 644 "$GCONF_TREE" + find "$GCONF_DIR" -mindepth 1 -maxdepth 1 -type d -exec rm -rf \{\} \; + rm -f "$GCONF_DIR/%gconf.xml" + SIGNAL_DAEMONS=yes + fi +done + +if [ "$SIGNAL_DAEMONS" = yes ]; then + # re-read gconf databases + kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true +fi --- gconf2-2.18.0.orig/debian/libgconf2-dev.links +++ gconf2-2.18.0/debian/libgconf2-dev.links @@ -0,0 +1 @@ +usr/share/doc/gconf2/html usr/share/gtk-doc/html/gconf --- gconf2-2.18.0.orig/debian/libgconf2-dev.postinst +++ gconf2-2.18.0/debian/libgconf2-dev.postinst @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +DOCDIR=/usr/share/gtk-doc/html/gconf +if [ -d "$DOCDIR" ]; then + if [ ! -L "$DOCDIR" ]; then + rmdir "$DOCDIR" + ln -s ../../doc/gconf2/html "$DOCDIR" + fi +fi + +#DEBHELPER# --- gconf2-2.18.0.orig/debian/gconf2-common.dirs +++ gconf2-2.18.0/debian/gconf2-common.dirs @@ -0,0 +1,6 @@ +/etc/gconf/2 +/etc/gconf/gconf.xml.mandatory +/etc/gconf/gconf.xml.defaults +/usr/share/gconf/defaults +/var/lib/gconf/defaults +/var/lib/gconf/debian.defaults --- gconf2-2.18.0.orig/debian/copyright +++ gconf2-2.18.0/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Vincent Renardias on +Fri, 12 May 2000 20:53:21 +0200. + +It was downloaded from the ftp.gnome.org. + +/* GConf + * Copyright (C) 1999, 2000 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * Boston, MA 02110-1301, USA. + */ --- gconf2-2.18.0.orig/debian/gconf2.manpages +++ gconf2-2.18.0/debian/gconf2.manpages @@ -0,0 +1 @@ +debian/update-gconf-defaults.8 --- gconf2-2.18.0.orig/debian/gconf2-common.install +++ gconf2-2.18.0/debian/gconf2-common.install @@ -0,0 +1,5 @@ +debian/default.path* usr/share/gconf/ +debian/tmp/etc/gconf/2/evoldap.conf +debian/tmp/usr/share/locale +debian/tmp/usr/share/sgml +debian/tmp/usr/share/GConf/schema usr/share/doc/gconf2-common/ --- gconf2-2.18.0.orig/debian/libgconf2-4.install +++ gconf2-2.18.0/debian/libgconf2-4.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/*.so.* +debian/tmp/usr/lib/libgconf2-4/gconf* +debian/tmp/usr/lib/libgconf2-4/2/*.so --- gconf2-2.18.0.orig/debian/gconf-schemas +++ gconf2-2.18.0/debian/gconf-schemas @@ -0,0 +1,71 @@ +#! /usr/bin/python +# +# copyright (c) 2006 Josselin Mouette +# Licensed under the GNU Lesser General Public License, version 2.1 +# See COPYING for details + +from optparse import OptionParser +import sys,os,os.path,shutil,tempfile + +parser = OptionParser(usage="usage: %prog --[un]register file1.schemas [file2.schemas [...]]") + +parser.add_option("--register", action="store_true", dest="register", + help="register schemas to the GConf database", + default=None) +parser.add_option("--unregister", action="store_false", dest="register", + help="unregister schemas from the GConf database", + default=None) + +(options, args) = parser.parse_args() + +if options.register==None: + parser.error("You need to specify --register or --unregister.") + +schema_location="/usr/share/gconf/schemas" + +schemas = [ ] +for schema in args: + if not os.path.isabs(schema): + schema=os.path.join(schema_location,schema) + if os.path.isfile(schema): + schemas.append(schema) + else: + sys.stderr.write('Warning: %s could not be found.\n'%schema) + +if len(schemas)<1: + parser.error("You need to give at least a file to (un)register.") + +if os.geteuid(): + parser.error("You must be root to launch this program.") + +tmp_home=tempfile.mkdtemp(prefix='gconf-') +env={'HOME': tmp_home, + 'GCONF_CONFIG_SOURCE': 'xml:readwrite:/var/lib/gconf/defaults'} +if options.register: + arg='--makefile-install-rule' +else: + arg='--makefile-uninstall-rule' + +save_stdout=os.dup(1) +os.close(1) +res=os.spawnvpe(os.P_WAIT,'gconftool-2',['gconftool-2',arg]+schemas,env) +os.dup2(save_stdout,1) +os.close(save_stdout) + +shutil.rmtree(tmp_home) + +if(res): + sys.exit(res) + +if options.register: + # tell running processes to re-read the GConf database + import signal + try: + pids=os.popen('pidof gconfd-2').readlines()[0].split() + for pid in pids: + try: + os.kill(int(pid),signal.SIGHUP) + except OSError: + pass + except IndexError: + pass --- gconf2-2.18.0.orig/debian/README.Debian +++ gconf2-2.18.0/debian/README.Debian @@ -0,0 +1,39 @@ +GConf 2 for Debian +================== + +The default GConf sources accessed by the GConf daemon are the following: + +* /etc/gconf/gconf.xml.mandatory/ + Mandatory settings set by the administrator. You can edit them with + gconf-editor, as root, to override any user settings. + +* ~/.gconf/ + The user's settings. + +* /etc/gconf/gconf.xml.defaults/ + Default settings set by the administrator. Edit them as root with + gconf-editor. + +* /var/lib/gconf/debian.defaults/ + This directory contains some defaults provided by Debian, CDD or local + packages. Packages can ship files of the form NNpackage, larger NN + values meaning larger priorities, in /usr/share/gconf/defaults/, + before launching update-gconf-defaults. Debian packages themselves use + 01, CDD distributions are encouraged to use values larger than 10, and + site-specific packages can use the largest values. The purpose is for + CDD to overwrite Debian defaults, and for site-specific packages to + overwrite all other defaults. + +* /var/lib/gconf/defaults/ + This directory contains the defaults computed from the upstream + schemas that lie in /usr/share/gconf/schemas. This is done by the + gconf-schemas script in the package's post-installation script. + +All system directories use a %gconf-tree.xml file containing the whole +structure, for performance reasons. The upgrade from the previous +situation (tree of %gconf.xml files) is done in gconf2 2.12.1-5. + +By default, the home directory structure is created as a tree layout. If +you want to use a merged tree on the home directory, you should run the +following command: + gconf-merge-tree ~/.gconf/