--- gconf-editor-2.30.0.orig/debian/copyright +++ gconf-editor-2.30.0/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by Takuo KITAME on +Mon, 11 Feb 2002 23:00:24 +0900. + +It was downloaded from http://ftp.gnome.org/pub/gnome/sources/gconf-editor/ + +Upstream Authors: + + Anders Carlsson + Fernando Herrera + Cosimo Cecchi + +Copyright: + + Copyright (C) 2001, 2002 Anders Carlsson + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + MA 02110-1301, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License Version 2 can be found in `/usr/share/common-licenses/GPL-2'. + --- gconf-editor-2.30.0.orig/debian/watch +++ gconf-editor-2.30.0/debian/watch @@ -0,0 +1,4 @@ +version=2 +http://ftp.gnome.org/pub/GNOME/sources/gconf-editor/([\d\.]+)/ \ + gconf-editor-(.*)\.tar\.gz \ + debian uupdate --- gconf-editor-2.30.0.orig/debian/control +++ gconf-editor-2.30.0/debian/control @@ -0,0 +1,36 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: gconf-editor +Section: utils +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: Debian GNOME Maintainers , Josselin Mouette , Loic Minier , Sebastian Dröge +Build-Depends: debhelper (>= 5), + cdbs (>= 0.4.41), + libgconf2-dev (>= 2.9.2), + libgtk2.0-dev (>= 2.12.0), + gettext, + gnome-pkg-tools (>= 0.10), + libdbus-glib-1-dev, + gnome-doc-utils, + pkg-config, + intltool (>= 0.35.0), + liblaunchpad-integration-dev (>= 0.1.17) +Standards-Version: 3.8.4 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gconf-editor/ubuntu + +Package: gconf-editor +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gconf-defaults-service (>= 2.28), + policykit-1-gnome +Description: An editor for the GConf configuration system + GConf-Editor is a tool used for editing the GConf configuration database. + This is not the recommended way of setting desktop preferences, but it might + be useful when the proper configuration utility for some software provides no + way of changing some option. --- gconf-editor-2.30.0.orig/debian/rules +++ gconf-editor-2.30.0/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.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-get-source.mk + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_CONFIGURE_EXTRA_FLAGS += --with-gconf-schema-file-dir=/usr/share/gconf/schemas --disable-scrollkeeper + +binary-post-install/gconf-editor:: + rm -rf debian/gconf-editor/var --- gconf-editor-2.30.0.orig/debian/changelog +++ gconf-editor-2.30.0/debian/changelog @@ -0,0 +1,479 @@ +gconf-editor (2.30.0-0ubuntu1) lucid; urgency=low + + * New upstream version + + -- Sebastien Bacher Tue, 30 Mar 2010 16:30:47 +0200 + +gconf-editor (2.29.92-0ubuntu1) lucid; urgency=low + + * New upstream release: + - Don't use deprecated GTK+/GConf symbols. + - Fix a crash. + * debian/control.in: + - Use Standards-Version 3.8.4 + + -- Robert Ancell Thu, 25 Mar 2010 16:57:12 +1100 + +gconf-editor (2.28.0-1ubuntu1) lucid; urgency=low + + * Sync on Debian + * debian/control.in: + - build-depends on liblaunchpad-integration-dev (>= 0.1.17) + - don't build-depends on scrollkeeper + - set vcs url + * debian/patches/01_lpi.patch, + debian/patches/70_autoconf.patch: + - launchpad integration and configure update + * debian/patches/03_menu_change.patch: + - update menus simplification + * debian/rules: + - use --disable-scrollkeeper option + + -- Sebastien Bacher Wed, 04 Nov 2009 15:43:13 +0100 + +gconf-editor (2.28.0-1) unstable; urgency=low + + [ Luca Bruno ] + * New upstream release. + * debian/control.in: + - Update Standards-Version to 3.8.3, no additional changes needed. + - Remove libpolkit-dbus-dev dependency. + * debian/copyright: + - Mention maintainers and add copyright notice. + - Update download url. + + [ Josselin Mouette ] + * Require gconf-defaults-service 2.28 and policykit-1-gnome. + + -- Josselin Mouette Fri, 09 Oct 2009 20:05:31 +0200 + +gconf-editor (2.26.0-1) unstable; urgency=low + + [ Luca Bruno ] + * New upstream release. + * debian/control.in: + - Update Standards-Version to 3.8.1, no additional changes needed. + - Build-Depends: + + Add libpolkit-dbus-dev and libdbus-glib-1-dev. + + Remove libgnome2-dev and libgnomeui-dev. + * debian/copyright: + - Specify GPL version 2. + * Remove debian/gconf-editor.1, not referenced in debian/ and present + upstream. + + [ Josselin Mouette ] + * Depend on gconf-defaults-service for the defaults settings backend, + version 2.26.2 for the correct path. + * Bump requirement on gtk+. + + -- Josselin Mouette Sun, 31 May 2009 01:14:19 +0200 + +gconf-editor (2.24.1-3) unstable; urgency=low + + [ Loic Minier ] + * Drop libxml-parser-perl bdep. + + [ Sebastian Dröge ] + * Upload to unstable. + + -- Sebastian Dröge Fri, 06 Mar 2009 19:30:36 +0100 + +gconf-editor (2.24.1-2) experimental; urgency=low + + [ Deng Xiyue ] + * Build-Depends on intltool >= 0.35.0. (Closes: #505765) + + -- Josselin Mouette Sat, 15 Nov 2008 06:30:43 +0100 + +gconf-editor (2.24.1-1) experimental; urgency=low + + * New upstream release. + * Standards version is 3.8.0. + + -- Josselin Mouette Fri, 14 Nov 2008 14:47:33 +0100 + +gconf-editor (2.22.0-1) unstable; urgency=low + + * New upstream stable release. + - Drop patches 01_search-dialog-segfault and 02_fg-color, merged upstream. + + -- Loic Minier Tue, 11 Mar 2008 10:08:07 +0100 + +gconf-editor (2.20.0-2) unstable; urgency=low + + * debian/patches/01_search-dialog-segfault.patch: + + Fix crash when closing the search dialog (Closes: #445259). + * debian/patches/02_fg-color.patch: + + Set the text color to the 'fg' color so that it matches the other text + regardless of GTK+ theme. Patch from upstream SVN. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + + -- Sebastian Dröge Tue, 05 Feb 2008 17:45:52 +0100 + +gconf-editor (2.20.0-1) unstable; urgency=low + + * New upstream translation and bugfix release. + + -- Josselin Mouette Sat, 22 Sep 2007 01:22:50 +0200 + +gconf-editor (2.18.2-1) unstable; urgency=low + + * New upstream stable release: + - Minor bug fixes + + -- Alan Baghumian Sat, 01 Sep 2007 08:23:22 +0330 + +gconf-editor (2.18.0-2) unstable; urgency=low + + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Fix URL in copyright. + + -- Loic Minier Tue, 17 Apr 2007 14:02:59 +0200 + +gconf-editor (2.18.0-1) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS. + * New upstream major stable release. + + -- Loic Minier Sun, 25 Mar 2007 11:58:09 +0200 + +gconf-editor (2.16.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Loic Minier Fri, 20 Oct 2006 10:12:32 +0200 + +gconf-editor (2.16.0-1) experimental; urgency=low + + * New upstream release. + - Build-depend on gnome-doc-utils and pkg-config. + + -- Loic Minier Mon, 25 Sep 2006 18:07:05 +0200 + +gconf-editor (2.15.92-1) experimental; urgency=low + + * New upstream development release. + + -- Loic Minier Tue, 15 Aug 2006 10:26:16 +0200 + +gconf-editor (2.15.91-1) experimental; urgency=low + + * New upstream development releases. + - Target at experimental. + - Bump up libgnome2-dev build-dep to >= 2.14.0. + - Drop 01_free_crasher_fix patch, merged upstream. + + -- Loic Minier Sun, 13 Aug 2006 20:37:30 +0200 + +gconf-editor (2.14.0-3) unstable; urgency=low + + * Update watch file to track stable releases and to use HTTP. + * Bump up Debhelper compatibility level to 5. + * Bump up Standards-Version to 3.7.2. + * Bump up libgnomeui-dev build-dep to >= 2.5.4. + * Bump up libgnome2-dev build-dep to >= 1.96.0. + * Add CDBS' utils. + + -- Loic Minier Sun, 13 Aug 2006 20:31:37 +0200 + +gconf-editor (2.14.0-2) unstable; urgency=low + + * 01_free_crasher_fix.patch: really include the patch (closes: #358902). + + -- Josselin Mouette Sun, 2 Apr 2006 20:17:57 +0200 + +gconf-editor (2.14.0-1) unstable; urgency=low + + * New upstream release. + * [debian/control.in] New maintainer: Josselin Mouette. + + Sebastien Bacher : + * debian/patches/01_free_crasher_fix.patch: + - patch from the CVS to fix a crasher when editing a key (Ubuntu: #36085) + + -- J.H.M. Dassen (Ray) Sat, 1 Apr 2006 17:19:10 +0200 + +gconf-editor (2.12.1-2) unstable; urgency=low + + * Upload to unstable. + + -- Josselin Mouette Sun, 8 Jan 2006 14:49:36 +0100 + +gconf-editor (2.12.1-1) experimental; urgency=low + + * New upstream version: + - Fix a crash with the combobox selection + - Fix a crasher when pressing F1 without yelp installed (Closes: #315129). + + [ Loic Minier ] + * Update watch file. [debian/watch] + + -- Sebastien Bacher Wed, 30 Nov 2005 13:58:40 +0100 + +gconf-editor (2.12.0-1) experimental; urgency=low + + * New upstream version + + -- Gustavo Noronha Silva Fri, 14 Oct 2005 12:17:19 -0300 + +gconf-editor (2.10.0-3) unstable; urgency=high + + * Pass --as-needed to ld. + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + * Standards-version is 3.6.2. + * Add a dependency on ${misc:Depends} (high urgency fix). + + -- Josselin Mouette Thu, 13 Oct 2005 21:25:27 +0200 + +gconf-editor (2.10.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Jordi Mallach Thu, 9 Jun 2005 14:56:41 +0200 + +gconf-editor (2.10.0-1) experimental; urgency=low + + * New upstream version. + * debian/control.in: + - updated the Build-Depends. + * debian/rules: + - clean the scrollkeeper files. + * debian/watch: + - updated. + + -- Sebastien Bacher Fri, 8 Apr 2005 22:05:31 +0200 + +gconf-editor (2.8.2-2) unstable; urgency=low + + * Upload to unstable. + + -- Sebastien Bacher Thu, 18 Nov 2004 15:58:55 +0100 + +gconf-editor (2.8.2-1) experimental; urgency=low + + * New upstream release. + + -- J.H.M. Dassen (Ray) Wed, 13 Oct 2004 19:04:47 +0200 + +gconf-editor (2.8.1-1) experimental; urgency=low + + * New upstream release. + * [debian/control.in] The libgconf build dependency was already for a + version that was only in experimental; tightened it to the current + version. + + -- J.H.M. Dassen (Ray) Fri, 1 Oct 2004 18:12:48 +0200 + +gconf-editor (2.8.0-1) experimental; urgency=low + + * New upstream release. + + -- J.H.M. Dassen (Ray) Mon, 13 Sep 2004 19:07:36 +0200 + +gconf-editor (2.7.92-1) experimental; urgency=low + + * New upstream development release. + + -- J.H.M. Dassen (Ray) Wed, 8 Sep 2004 20:50:03 +0200 + +gconf-editor (2.7.91-1) experimental; urgency=low + + * New upstream development release. + * [debian/control.in] Tightened libgconf build dependency, just in case. + + -- J.H.M. Dassen (Ray) Sun, 22 Aug 2004 13:40:50 +0200 + +gconf-editor (2.7.90-1) experimental; urgency=low + + * New upstream development release. + * [debian/rules] Ensure at build time that the library dependency + information is complete. + * [debian/control.in] Tightened libgconf build dependency, just in case. + + -- J.H.M. Dassen (Ray) Sun, 15 Aug 2004 16:15:30 +0200 + +gconf-editor (2.7.1-2) experimental; urgency=low + + * GNOME Team Upload. + * Switched to CDBS. + * debian/control.in: + - Build-Depends on cdbs, libgnome2-dev, libgnomeui-dev and scrollkeeper. + * debian/rules: + - switched to CDBS. + + -- Sebastien Bacher Thu, 1 Jul 2004 17:16:15 +0200 + +gconf-editor (2.7.1-1) experimental; urgency=low + + * GNOME Team Upload. + * New (development) release. + * debian/rules: + + added a dh_gconf call since gconf-editor has a schema now. + + used DESTDIR instead of prefix for the make install. + * debian/watch: + + updated for the 2.7 branch. + + -- Sebastien Bacher Tue, 22 Jun 2004 19:31:37 +0200 + +gconf-editor (2.6.2-1) unstable; urgency=low + + * New upstream release. + + -- Sebastien Bacher Thu, 17 Jun 2004 18:26:07 +0200 + +gconf-editor (2.6.1-2) unstable; urgency=low + + * Upload to unstable. + * [debian/control.in] Tightened build dependencies to ensure build against + unstable's GNOME 2.6 packages. + + -- J.H.M. Dassen (Ray) Wed, 26 May 2004 15:36:57 +0200 + +gconf-editor (2.6.1-1) experimental; urgency=low + + * New upstream release + + Don't escape keys, that fixes bug with "@" in keys' names. + + -- Sebastien Bacher Fri, 16 Apr 2004 21:08:55 +0200 + +gconf-editor (2.6.0-3) experimental; urgency=low + + * [debian/control.in] + * Added libxml-parser-perl build dependency. (Closes: #240631) + * Removed full stop from description. + * [debian/watch] Watch 2.6. + + -- J.H.M. Dassen (Ray) Sun, 28 Mar 2004 18:43:13 +0200 + +gconf-editor (2.6.0-2) experimental; urgency=low + + * Upload of 2.6.0 in experimental this time. + + -- Sebastien Bacher Sat, 27 Mar 2004 22:11:44 +0100 + +gconf-editor (2.6.0-1.is.2.4.0) unstable; urgency=low + + * Hack to revert back to 2.4.0, 2.6 was uploaded in unstable instead of + experimental. + + -- Sebastien Bacher Sat, 27 Mar 2004 21:11:35 +0100 + +gconf-editor (2.6.0-1) unstable; urgency=low + + * Gnome Team Upload. + * New upstream release: + + fix copy/paste into X apps (Closes: #191668). + * debian/control.in: + + updated Build-Depends. + * debian/patches/01_double_click.dpatch: + + removed since included in the new version. + * debian/patches/02_unset_value.dpatch: + + removed since included in the new version. + + -- Sebastien Bacher Sat, 27 Mar 2004 18:10:25 +0100 + +gconf-editor (2.4.0-3) unstable; urgency=low + + * Added bugzilla patch to fix bug with unset values + (Closes: #166807, #205500). + + -- Sebastien Bacher Fri, 31 Oct 2003 15:44:10 +0100 + +gconf-editor (2.4.0-2) unstable; urgency=low + + * Added patch from bugzilla to implement double-click to open a folder + (Closes: #179299). + * Included manpage provided by Goran Weinholt + (Closes: #179935). + * Updated package description (adapted from the manpage) (Closes: #209609). + + -- Sebastien Bacher Wed, 22 Oct 2003 15:04:13 +0200 + +gconf-editor (2.4.0-1) unstable; urgency=low + + * New upstream release + * Update Build-Depends + * Gnome Team Upload + + -- Sebastien Bacher Sun, 19 Oct 2003 21:30:46 +0200 + +gconf-editor (0.4.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 3 Sep 2003 14:01:05 +0900 + +gconf-editor (0.4.0-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 23 Jan 2003 19:59:36 +0900 + +gconf-editor (0.3.1-2) unstable; urgency=low + + * update config.{guess,sub} + * change Maintainer address to @debian.org + + -- Takuo KITAME Wed, 13 Nov 2002 14:50:27 +0900 + +gconf-editor (0.3.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 5 Sep 2002 14:05:18 +0900 + +gconf-editor (0.3-1) unstable; urgency=low + + * New upstream release (closes: #157768) + + -- Takuo KITAME Mon, 26 Aug 2002 15:56:14 +0900 + +gconf-editor (0.2-2) unstable; urgency=low + + * Build against libgtk2.0-0png3 + + -- Takuo KITAME Wed, 14 Aug 2002 23:43:16 +0900 + +gconf-editor (0.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 21 May 2002 13:36:11 +0900 + +gconf-editor (0.1-5) unstable; urgency=low + + * build against libgtk2.0 + + -- Takuo KITAME Sat, 30 Mar 2002 05:13:40 +0900 + +gconf-editor (0.1-4) unstable; urgency=low + + * build against libgtk1.3-15 + + -- Takuo KITAME Tue, 26 Feb 2002 13:51:04 +0900 + +gconf-editor (0.1-3) unstable; urgency=low + + * build against libgtk1.3-14 + + -- Takuo KITAME Sat, 23 Feb 2002 03:08:43 +0900 + +gconf-editor (0.1-2) unstable; urgency=low + + * build against libatk12 + + -- Takuo KITAME Sun, 17 Feb 2002 02:04:43 +0900 + +gconf-editor (0.1-1) unstable; urgency=low + + * Initial Release. (closes: #133377) + + -- Takuo KITAME Mon, 11 Feb 2002 23:02:14 +0900 + --- gconf-editor-2.30.0.orig/debian/control.in +++ gconf-editor-2.30.0/debian/control.in @@ -0,0 +1,31 @@ +Source: gconf-editor +Section: utils +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Josselin Mouette +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>= 5), + cdbs (>= 0.4.41), + libgconf2-dev (>= 2.9.2), + libgtk2.0-dev (>= 2.12.0), + gettext, + gnome-pkg-tools (>= 0.10), + libdbus-glib-1-dev, + gnome-doc-utils, + pkg-config, + intltool (>= 0.35.0), + liblaunchpad-integration-dev (>= 0.1.17) +Standards-Version: 3.8.4 +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gconf-editor/ubuntu + +Package: gconf-editor +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + gconf-defaults-service (>= 2.28), + policykit-1-gnome +Description: An editor for the GConf configuration system + GConf-Editor is a tool used for editing the GConf configuration database. + This is not the recommended way of setting desktop preferences, but it might + be useful when the proper configuration utility for some software provides no + way of changing some option. --- gconf-editor-2.30.0.orig/debian/compat +++ gconf-editor-2.30.0/debian/compat @@ -0,0 +1 @@ +5 --- gconf-editor-2.30.0.orig/debian/patches/03_menu_change.patch +++ gconf-editor-2.30.0/debian/patches/03_menu_change.patch @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' gconf-editor-2.27.91/data/gconf-editor.desktop.in.in gconf-editor-2.27.91.new/data/gconf-editor.desktop.in.in +--- gconf-editor-2.27.91/data/gconf-editor.desktop.in.in 2009-04-19 05:39:36.000000000 +1000 ++++ gconf-editor-2.27.91.new/data/gconf-editor.desktop.in.in 2009-08-25 11:52:45.000000000 +1000 +@@ -6,6 +6,7 @@ + Type=Application + Icon=gconf-editor + StartupNotify=true ++NoDisplay=true + Categories=GNOME;GTK;System; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gconf-editor --- gconf-editor-2.30.0.orig/debian/patches/70_autoconf.patch +++ gconf-editor-2.30.0/debian/patches/70_autoconf.patch @@ -0,0 +1,242 @@ +## Description: add some description +## Origin/Author: add some origin or author +## Bug: bug URL +diff -Nur -x '*.orig' -x '*~' gconf-editor-2.29.92/configure gconf-editor-2.29.92.new/configure +--- gconf-editor-2.29.92/configure 2010-03-11 12:15:58.000000000 +1100 ++++ gconf-editor-2.29.92.new/configure 2010-03-25 17:33:31.474225479 +1100 +@@ -6523,11 +6523,11 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + lt_cv_deplibs_check_method=pass_all + ;; + +-netbsd*) ++netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else +@@ -8711,7 +8711,7 @@ + lt_prog_compiler_static='-non_shared' + ;; + +- linux* | k*bsd*-gnu) ++ linux* | k*bsd*-gnu | kopensolaris*-gnu) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) +@@ -9160,6 +9160,9 @@ + openbsd*) + with_gnu_ld=no + ;; ++ linux* | k*bsd*-gnu) ++ link_all_deplibs=no ++ ;; + esac + + ld_shlibs=yes +@@ -9181,6 +9184,7 @@ + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in ++ *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... +@@ -9272,7 +9276,7 @@ + archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + ;; + +- gnu* | linux* | tpf* | k*bsd*-gnu) ++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in +@@ -9342,7 +9346,7 @@ + fi + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= +@@ -9517,6 +9521,7 @@ + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi ++ link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then +@@ -9843,7 +9848,7 @@ + link_all_deplibs=yes + ;; + +- netbsd*) ++ netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else +@@ -10733,7 +10738,7 @@ + ;; + + # This must be Linux ELF. +-linux* | k*bsd*-gnu) ++linux* | k*bsd*-gnu | kopensolaris*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no +@@ -10773,13 +10778,10 @@ + # before this can be enabled. + hardcode_into_libs=yes + +- # Add ABI-specific directories to the system library path. +- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +- + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +@@ -10791,6 +10793,18 @@ + dynamic_linker='GNU/Linux ld.so' + ;; + ++netbsdelf*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='NetBSD ld.elf_so' ++ ;; ++ + netbsd*) + version_type=sunos + need_lib_prefix=no +@@ -11411,7 +11425,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11414 "configure" ++#line 11428 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11507,7 +11521,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11510 "configure" ++#line 11524 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12044,49 +12058,59 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF_EDITOR" >&5 + $as_echo_n "checking for GCONF_EDITOR... " >&6; } + +-if test -n "$GCONF_EDITOR_CFLAGS"; then +- pkg_cv_GCONF_EDITOR_CFLAGS="$GCONF_EDITOR_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GCONF_EDITOR_CFLAGS"; then ++ pkg_cv_GCONF_EDITOR_CFLAGS="$GCONF_EDITOR_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GCONF_EDITOR_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi +-if test -n "$GCONF_EDITOR_LIBS"; then +- pkg_cv_GCONF_EDITOR_LIBS="$GCONF_EDITOR_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$GCONF_EDITOR_LIBS"; then ++ pkg_cv_GCONF_EDITOR_LIBS="$GCONF_EDITOR_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_GCONF_EDITOR_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1" 2>/dev/null` + else + pkg_failed=yes + fi +- else +- pkg_failed=untried ++ fi ++else ++ pkg_failed=untried + fi + + +@@ -12099,19 +12123,22 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- GCONF_EDITOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= 2.9.2 ++ GCONF_EDITOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 +- dbus-glib-1" 2>&1` ++ launchpad-integration ++ dbus-glib-1"` + else +- GCONF_EDITOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= 2.9.2 ++ GCONF_EDITOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 +- dbus-glib-1" 2>&1` ++ launchpad-integration ++ dbus-glib-1"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GCONF_EDITOR_PKG_ERRORS" >&5 + + as_fn_error "Package requirements (gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1) were not met: + + $GCONF_EDITOR_PKG_ERRORS --- gconf-editor-2.30.0.orig/debian/patches/01_lpi.patch +++ gconf-editor-2.30.0/debian/patches/01_lpi.patch @@ -0,0 +1,41 @@ +diff -Nur -x '*.orig' -x '*~' gconf-editor-2.27.91/configure.in gconf-editor-2.27.91.new/configure.in +--- gconf-editor-2.27.91/configure.in 2009-08-24 19:52:24.000000000 +1000 ++++ gconf-editor-2.27.91.new/configure.in 2009-08-25 11:52:23.000000000 +1000 +@@ -35,6 +35,7 @@ + PKG_CHECK_MODULES(GCONF_EDITOR, + gconf-2.0 >= 2.9.2 + gtk+-2.0 >= 2.12.0 ++ launchpad-integration + dbus-glib-1) + + if test "$enable_maintainer_mode" = "yes"; then +diff -Nur -x '*.orig' -x '*~' gconf-editor-2.27.91/src/gconf-editor-window.c gconf-editor-2.27.91.new/src/gconf-editor-window.c +--- gconf-editor-2.27.91/src/gconf-editor-window.c 2009-08-24 19:19:24.000000000 +1000 ++++ gconf-editor-2.27.91.new/src/gconf-editor-window.c 2009-08-25 11:52:23.000000000 +1000 +@@ -33,6 +33,8 @@ + #include "gedit-output-window.h" + #include "gconf-search-dialog.h" + ++#include ++ + #include + #include + #include +@@ -809,6 +811,7 @@ + " " + " " + " " ++ " " + " " + " " + " " +@@ -1503,6 +1506,9 @@ + exit (EXIT_FAILURE); + } + ++ launchpad_integration_add_ui (window->ui_manager, ++ "/GConfEditorMenu/HelpMenu/LaunchpadItems"); ++ + menubar = gtk_ui_manager_get_widget (window->ui_manager, "/GConfEditorMenu"); + gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0); +