← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gconf/oneiric-proposed

« back to all changes in this revision

Viewing changes to debian/patches/01_defaults_path.patch

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort, Josselin Mouette, Sjoerd Simons, Emilio Pozuelo Monfort
  • Date: 2010-12-06 00:53:14 UTC
  • mfrom: (1.1.25 upstream)
  • mto: (7.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: james.westby@ubuntu.com-20101206005314-uz89yke6r1xfw504
Tags: 2.32.1-1
http://bugs.debian.org/599032
http://bugs.debian.org/599049
http://bugs.debian.org/599125
http://bugs.debian.org/599198
http://bugs.debian.org/599393
http://bugs.debian.org/599683
http://bugs.debian.org/599854
http://bugs.debian.org/600899
[ Josselin Mouette ]
* Include patch-translations.mk, bump build-depends accordingly.
* Include 03_error_message.patch in POTFILES.in.
* pt_BR.po: Brazilian Portuguese translation. Closes: #599032.
* fr.po: French translation by Christian Perrier. Closes: #599049.
* da.po: Danish translation by Joe Hansen. Closes: #599125.
* cs.po: Czech translation by Michal Simunek. Closes: #599198.
* update-gconf-defaults: patch from Ubuntu to deal with broken 
  symlinks. Closes: #599393. Thanks Michael Vogt.
* de.po: German translation by Helge Kreutzmann. Closes: #599683.
* sv.po: Swedish translation by Martin Bagge. Closes: #599854.
* 04_manpage.patch: patch from A. Costa. Fixes typos in the manual 
  page. Closes: #600899.

[ Sjoerd Simons ]
* New upstream release
* Bump gobject-introspection to the lastest version to generate the most
  recent .gir version
* debian/patches/03_error_message.patch
  + Removed, merged upstream
* debian/rules:
  + Specify compilation with gtk2

[ Emilio Pozuelo Monfort ]
* Switch to source format 3.0 (quilt).
* debian/patches/*:
  - Updated to apply cleanly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_defaults_path.patch
1
 
diff -urN GConf-2.28.0.orig/defaults/gconf-defaults.c GConf-2.28.0/defaults/gconf-defaults.c
2
 
--- GConf-2.28.0.orig/defaults/gconf-defaults.c 2009-08-19 17:35:32.000000000 +0200
3
 
+++ GConf-2.28.0/defaults/gconf-defaults.c      2009-10-04 12:17:01.000000000 +0200
 
1
--- a/defaults/gconf-defaults.c
 
2
+++ b/defaults/gconf-defaults.c
4
3
@@ -811,7 +811,7 @@
5
4
        else {
6
5
                adata->annotation_key = "org.gnome.gconf.defaults.set-system.prefix";
10
9
        }
11
10
 
12
11
         polkit_authority_enumerate_actions (mechanism->priv->auth,
13
 
diff -urN GConf-2.28.0.orig/gconf/gconfd.c GConf-2.28.0/gconf/gconfd.c
14
 
--- GConf-2.28.0.orig/gconf/gconfd.c    2009-08-19 17:35:32.000000000 +0200
15
 
+++ GConf-2.28.0/gconf/gconfd.c 2009-10-04 12:16:44.000000000 +0200
16
 
@@ -637,7 +637,7 @@
 
12
--- a/gconf/gconfd.c
 
13
+++ b/gconf/gconfd.c
 
14
@@ -667,7 +667,7 @@
17
15
 
18
16
          gconf_log (GCL_DEBUG, "System defaults changed.  Notifying.");
19
17