--- gconf-editor-2.13.90.orig/debian/gconf-editor.1 +++ gconf-editor-2.13.90/debian/gconf-editor.1 @@ -0,0 +1,38 @@ +.TH GCONF\-EDITOR 1 "12 June 2003" +.SH NAME +gconf\-editor \- an editor for the GConf configuration system +.SH SYNOPSIS +.B gconf\-editor +.SH DESCRIPTION +\fBGConf\-Editor\fP is a tool used for editing the GConf configuration +database. +It might be useful when the proper configuration utility for some +software provides no way of changing some option. +.SH USAGE +The main window consists of a tree showing the GConf configuration +database hierarchy, a list of the keys available, and documentation +for the selected key. + +Key values can be changed by either changing them directly in the +list, or right clicking on them and selecting \fIEdit key\fP. +Changes take immediate effect in running programs. +New keys can be added by right clicking in the list and selecting +\fINew key\fP. + +Bookmarks may be set for quick lookup of a key later. +.SH NOTES +This tool allows you to directly edit your configuration database. +This is not the recommended way of setting desktop preferences. +Use this tool at your own risk. +.SH AUTHOR +Anders Carlsson . +.br +This manual page was written by G\[:o]ran Weinholt for the Debian project, +but may be used by others. +.SH REPORTING BUGS +Please report bugs at http://bugzilla.gnome.org/. +.SH SEE ALSO +.BR gconfd\-2 (1), +.BR gconftool\-2 (1). + +.I http://www.gnome.org/projects/gconf/ --- gconf-editor-2.13.90.orig/debian/changelog +++ gconf-editor-2.13.90/debian/changelog @@ -0,0 +1,299 @@ +gconf-editor (2.13.90-0ubuntu1) dapper; urgency=low + + * New upstream version + * debian/patches/02_autoconf.patch: + - updated + * debian/patches/03_menu_change.patch: + - updated + + -- Sebastien Bacher Mon, 30 Jan 2006 12:05:44 +0100 + +gconf-editor (2.12.1-2ubuntu1) dapper; urgency=low + + * Resynchronized with Debian (Ubuntu: #22184) + - debian/control.in: + - added liblaunchpad-integration-dev + - debian/patches/01_lpi.patch, + debian/patches/02_autoconf.patch, + debian/patches/03_menu_change.patch: + - added. + + -- Daniel Holbach Thu, 12 Jan 2006 21:08:52 +0100 + +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.13.90.orig/debian/patches/02_autoconf.patch +++ gconf-editor-2.13.90/debian/patches/02_autoconf.patch @@ -0,0 +1,964 @@ +diff -Nur gconf-editor-2.13.90/configure gconf-editor-2.13.90.new/configure +--- gconf-editor-2.13.90/configure 2006-01-30 07:33:03.000000000 +0100 ++++ gconf-editor-2.13.90.new/configure 2006-01-30 12:07:45.000000000 +0100 +@@ -1178,7 +1178,7 @@ + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -2876,8 +2876,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2935,8 +2934,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3052,8 +3050,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3107,8 +3104,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3153,8 +3149,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3198,8 +3193,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3696,8 +3690,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4419,7 +4412,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4422 "configure"' > conftest.$ac_ext ++ echo '#line 4415 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -4539,8 +4532,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4619,8 +4611,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4687,8 +4678,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4948,8 +4938,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5007,8 +4996,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5079,8 +5067,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5124,8 +5111,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5597,7 +5583,7 @@ + + + # Provide some information about the compiler. +-echo "$as_me:5600:" \ ++echo "$as_me:5586:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +@@ -5643,8 +5629,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5693,8 +5678,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6695,11 +6679,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6698: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6682: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6702: \$? = $ac_status" >&5 ++ echo "$as_me:6686: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -6957,11 +6941,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6960: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6944: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6964: \$? = $ac_status" >&5 ++ echo "$as_me:6948: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7019,11 +7003,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7022: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7006: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7026: \$? = $ac_status" >&5 ++ echo "$as_me:7010: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -7447,8 +7431,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7508,8 +7491,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8405,7 +8387,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 8408 "configure"' > conftest.$ac_ext ++ echo '#line 8390 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8740,8 +8722,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8844,8 +8825,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8910,8 +8890,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9004,8 +8983,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9070,8 +9048,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9137,8 +9114,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9204,8 +9180,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9280,7 +9255,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10509,8 +10483,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11626,11 +11599,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11629: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11602: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11633: \$? = $ac_status" >&5 ++ echo "$as_me:11606: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -11688,11 +11661,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11691: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11664: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11695: \$? = $ac_status" >&5 ++ echo "$as_me:11668: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -12203,7 +12176,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 12206 "configure"' > conftest.$ac_ext ++ echo '#line 12179 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -12538,8 +12511,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12642,8 +12614,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12708,8 +12679,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12802,8 +12772,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12868,8 +12837,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -12935,8 +12903,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13002,8 +12969,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -13078,7 +13044,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5) ++ (eval echo "\"\$as_me:14030: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:14068: \$? = $ac_status" >&5 ++ echo "$as_me:14034: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -14123,11 +14089,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:14126: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:14092: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:14130: \$? = $ac_status" >&5 ++ echo "$as_me:14096: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14541,8 +14507,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14592,8 +14557,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15489,7 +15453,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 15492 "configure"' > conftest.$ac_ext ++ echo '#line 15456 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -16266,11 +16230,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16269: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16233: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16273: \$? = $ac_status" >&5 ++ echo "$as_me:16237: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16528,11 +16492,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16531: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16495: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16535: \$? = $ac_status" >&5 ++ echo "$as_me:16499: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16590,11 +16554,11 @@ + -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16593: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16557: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16597: \$? = $ac_status" >&5 ++ echo "$as_me:16561: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -17018,8 +16982,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17079,8 +17042,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -17976,7 +17938,7 @@ + libsuff= + case "$host_cpu" in + x86_64*|s390x*|powerpc64*) +- echo '#line 17979 "configure"' > conftest.$ac_ext ++ echo '#line 17941 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -18311,8 +18273,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18415,8 +18376,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18481,8 +18441,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18575,8 +18534,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18641,8 +18599,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18708,8 +18665,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18775,8 +18731,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18851,7 +18806,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <= 2.9.2 \\ + gtk+-2.0 >= 2.5.5 \\ + libgnome-2.0 >= 1.96.0 \\ +- libgnomeui-2.0 >= 2.5.4\"") >&5 ++ libgnomeui-2.0 >= 2.5.4 \\ ++ launchpad-integration\"") >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4") 2>&5 ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GCONF_EDITOR_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4" 2>/dev/null` ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20250,18 +20208,21 @@ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.9.2 \\ + gtk+-2.0 >= 2.5.5 \\ + libgnome-2.0 >= 1.96.0 \\ +- libgnomeui-2.0 >= 2.5.4\"") >&5 ++ libgnomeui-2.0 >= 2.5.4 \\ ++ launchpad-integration\"") >&5 + ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4") 2>&5 ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GCONF_EDITOR_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4" 2>/dev/null` ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -20273,14 +20234,16 @@ + GCONF_EDITOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4"` ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration"` + # Put the nasty error message in config.log where it belongs + echo "$GCONF_EDITOR_PKG_ERRORS" 1>&5 + + { { echo "$as_me:$LINENO: error: Package requirements (gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4) were not met. ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +@@ -20290,7 +20253,8 @@ + echo "$as_me: error: Package requirements (gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4) were not met. ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration) were not met. + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +@@ -20413,8 +20377,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20559,8 +20522,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20631,8 +20593,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20776,8 +20737,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20835,8 +20795,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20933,8 +20892,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21013,8 +20971,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21078,8 +21035,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21143,8 +21099,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21221,8 +21176,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21286,8 +21240,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21403,8 +21356,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21571,8 +21523,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21705,8 +21656,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21791,8 +21741,7 @@ + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -22949,11 +22898,6 @@ + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -22992,6 +22936,12 @@ + fi;; + esac + done` || { (exit 1); exit 1; } ++ ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub --- gconf-editor-2.13.90.orig/debian/patches/01_lpi.patch +++ gconf-editor-2.13.90/debian/patches/01_lpi.patch @@ -0,0 +1,44 @@ +diff -Nur gconf-editor-2.11.92.orig/configure.in gconf-editor-2.11.92/configure.in +--- gconf-editor-2.11.92.orig/configure.in 2005-08-23 21:13:09.000000000 +0200 ++++ gconf-editor-2.11.92/configure.in 2005-08-24 10:23:10.000000000 +0200 +@@ -38,7 +38,8 @@ + gconf-2.0 >= 2.9.2 \ + gtk+-2.0 >= 2.5.5 \ + libgnome-2.0 >= 1.96.0 \ +- libgnomeui-2.0 >= 2.5.4) ++ libgnomeui-2.0 >= 2.5.4 \ ++ launchpad-integration) + + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + +diff -Nur gconf-editor-2.11.92.orig/src/gconf-editor-window.c gconf-editor-2.11.92/src/gconf-editor-window.c +--- gconf-editor-2.11.92.orig/src/gconf-editor-window.c 2005-06-25 18:08:17.000000000 +0200 ++++ gconf-editor-2.11.92/src/gconf-editor-window.c 2005-08-24 10:24:47.000000000 +0200 +@@ -32,6 +32,7 @@ + #include "gedit-output-window.h" + #include "gconf-search-dialog.h" + #include ++#include + #include + #include + +@@ -784,6 +785,9 @@ + " " + " " + " " ++ " " ++ " " ++ " " + " " + " " + " " +@@ -1459,6 +1463,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); + --- gconf-editor-2.13.90.orig/debian/patches/03_menu_change.patch +++ gconf-editor-2.13.90/debian/patches/03_menu_change.patch @@ -0,0 +1,11 @@ +diff -Nur gconf-editor-2.12.0.orig/data/gconf-editor.desktop.in.in gconf-editor-2.12.0/data/gconf-editor.desktop.in.in +--- gconf-editor-2.12.0.orig/data/gconf-editor.desktop.in.in 2004-11-24 20:46:34.000000000 +0100 ++++ gconf-editor-2.12.0/data/gconf-editor.desktop.in.in 2005-11-18 15:28:49.000000000 +0100 +@@ -8,6 +8,7 @@ + Icon=gconf-editor.png + StartupNotify=true + Categories=GNOME;GTK;Application;System; ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gconf-editor + X-GNOME-Bugzilla-Component=general --- gconf-editor-2.13.90.orig/debian/control +++ gconf-editor-2.13.90/debian/control @@ -0,0 +1,16 @@ +Source: gconf-editor +Section: utils +Priority: optional +Maintainer: Takuo KITAME +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Ondřej Surý , Rob Bradford , Robert McQueen , Ross Burton , Sebastien Bacher , Sjoerd Simons , +Build-Depends: debhelper (>> 3.0.0), cdbs, libgconf2-dev (>= 2.9.2), libgtk2.0-dev (>= 2.5.5), gettext, gnome-pkg-tools, libxml-parser-perl, libgnome2-dev, libgnomeui-dev, scrollkeeper, liblaunchpad-integration-dev +Standards-Version: 3.6.2 + +Package: gconf-editor +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +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.13.90.orig/debian/rules +++ gconf-editor-2.13.90/debian/rules @@ -0,0 +1,14 @@ +#!/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/gnome-pkg-tools/1/rules/uploaders.mk + +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-z,defs -Wl,-O1 -Wl,--as-needed" + +DEB_CONFIGURE_EXTRA_FLAGS := --with-gconf-schema-file-dir=/usr/share/gconf/schemas + +binary-post-install/gconf-editor:: + rm -rf debian/gconf-editor/var --- gconf-editor-2.13.90.orig/debian/control.in +++ gconf-editor-2.13.90/debian/control.in @@ -0,0 +1,16 @@ +Source: gconf-editor +Section: utils +Priority: optional +Maintainer: Takuo KITAME +Uploaders: @GNOME_TEAM@ +Build-Depends: debhelper (>> 3.0.0), cdbs, libgconf2-dev (>= 2.9.2), libgtk2.0-dev (>= 2.5.5), gettext, gnome-pkg-tools, libxml-parser-perl, libgnome2-dev, libgnomeui-dev, scrollkeeper, liblaunchpad-integration-dev +Standards-Version: 3.6.2 + +Package: gconf-editor +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +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.13.90.orig/debian/watch +++ gconf-editor-2.13.90/debian/watch @@ -0,0 +1,4 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/gconf-editor/2.12/ \ + gconf-editor-(.*)\.tar\.gz \ + debian uupdate --- gconf-editor-2.13.90.orig/debian/copyright +++ gconf-editor-2.13.90/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Takuo KITAME on +Mon, 11 Feb 2002 23:00:24 +0900. + +It was downloaded from ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/ + +Upstream Author: Anders Carlsson + +Copyright: + + 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 can be found in `/usr/share/common-licenses/GPL'. +