r45454 - in /desktop/unstable/gnome-maps/debian: changelog control control.in patches/ patches/schema_translation.patch patches/series
noskcaj-guest at users.alioth.debian.org
noskcaj-guest at users.alioth.debian.org
Thu Jul 2 07:00:53 UTC 2015
Author: noskcaj-guest
Date: Thu Jul 2 07:00:53 2015
New Revision: 45454
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45454
Log:
* Fix the build-depends. (Many changes)
* debian/patches/schema_translation.patch:
- Fix build failure with intltool translation of gsettings schema
Added:
desktop/unstable/gnome-maps/debian/patches/
desktop/unstable/gnome-maps/debian/patches/schema_translation.patch
desktop/unstable/gnome-maps/debian/patches/series
Modified:
desktop/unstable/gnome-maps/debian/changelog
desktop/unstable/gnome-maps/debian/control
desktop/unstable/gnome-maps/debian/control.in
Modified: desktop/unstable/gnome-maps/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-maps/debian/changelog?rev=45454&op=diff
==============================================================================
--- desktop/unstable/gnome-maps/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-maps/debian/changelog [utf-8] Thu Jul 2 07:00:53 2015
@@ -1,6 +1,12 @@
gnome-maps (3.16.2-1) UNRELEASED; urgency=medium
+ [ Michael Biebl ]
* New upstream release.
+
+ [ Jackson Doak ]
+ * Fix the build-depends. (Many changes)
+ * debian/patches/schema_translation.patch:
+ - Fix build failure with intltool translation of gsettings schema
-- Michael Biebl <biebl at debian.org> Mon, 15 Jun 2015 20:19:56 +0200
Modified: desktop/unstable/gnome-maps/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-maps/debian/control?rev=45454&op=diff
==============================================================================
--- desktop/unstable/gnome-maps/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-maps/debian/control [utf-8] Thu Jul 2 07:00:53 2015
@@ -11,8 +11,15 @@
dh-autoreconf,
gnome-common,
gnome-pkg-tools,
- libgjs-dev (>= 1.39.0),
- libglib2.0-dev (>= 2.39.3)
+ libgjs-dev (>= 1.43.3),
+ libglib2.0-dev (>= 2.39.3),
+ libgtk-3-dev (>= 3.15.9),
+ geoclue-2.0 (>= 0.12.99),
+ libgee-0.8-dev (>= 0.16.0),
+ libfolks-dev (>= 0.10.0),
+ libgeocode-glib-dev (>= 3.15.2),
+ libchamplain-0.12-dev (>= 0.12.9),
+ libgirepository1.0-dev (>= 0.6.3)
Standards-Version: 3.9.6
Homepage: https://wiki.gnome.org/Apps/Maps
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-maps
Modified: desktop/unstable/gnome-maps/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-maps/debian/control.in?rev=45454&op=diff
==============================================================================
--- desktop/unstable/gnome-maps/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-maps/debian/control.in [utf-8] Thu Jul 2 07:00:53 2015
@@ -7,8 +7,15 @@
dh-autoreconf,
gnome-common,
gnome-pkg-tools,
- libgjs-dev (>= 1.39.0),
- libglib2.0-dev (>= 2.39.3)
+ libgjs-dev (>= 1.43.3),
+ libglib2.0-dev (>= 2.39.3),
+ libgtk-3-dev (>= 3.15.9),
+ geoclue-2.0 (>= 0.12.99),
+ libgee-0.8-dev (>= 0.16.0),
+ libfolks-dev (>= 0.10.0),
+ libgeocode-glib-dev (>= 3.15.2),
+ libchamplain-0.12-dev (>= 0.12.9),
+ libgirepository1.0-dev (>= 0.6.3)
Standards-Version: 3.9.6
Homepage: https://wiki.gnome.org/Apps/Maps
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-maps
Added: desktop/unstable/gnome-maps/debian/patches/schema_translation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-maps/debian/patches/schema_translation.patch?rev=45454&op=file
==============================================================================
--- desktop/unstable/gnome-maps/debian/patches/schema_translation.patch (added)
+++ desktop/unstable/gnome-maps/debian/patches/schema_translation.patch [utf-8] Thu Jul 2 07:00:53 2015
@@ -0,0 +1,169 @@
+commit 3903262a28f7024236f50b198e320cfe15e4b04d
+Author: Emmanuele Bassi <ebassi at gnome.org>
+Date: Tue Apr 14 00:09:58 2015 +0100
+
+ Do not use intltool to translate GSettings schema
+
+ There's no need to do that, and since intltool merges translations into
+ the XML by default, it actively breaks the gschema format.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=747810
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 81dcfe2..e0ce3e9 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -19,9 +19,9 @@ apps_DATA = org.gnome.Maps.desktop
+
+ @INTLTOOL_DESKTOP_RULE@
+
+-gsettings_SCHEMAS = org.gnome.Maps.gschema.xml
+-
+ @INTLTOOL_XML_RULE@
++
++gsettings_SCHEMAS = org.gnome.Maps.gschema.xml
+ @GSETTINGS_RULES@
+
+ appdatadir = $(datadir)/appdata
+@@ -43,7 +43,6 @@ EXTRA_DIST = \
+ org.gnome.Maps.service.in \
+ org.gnome.Maps.data.gresource.xml \
+ org.gnome.Maps.appdata.xml.in \
+- org.gnome.Maps.gschema.xml.in \
+ $(app_resource_files) \
+ $(NULL)
+
+@@ -53,10 +52,8 @@ CLEANFILES = \
+ org.gnome.Maps.appdata.xml \
+ org.gnome.Maps.appdata.valid \
+ $(apps_DATA) \
+- org.gnome.Maps.gschema.xml \
+ org.gnome.Maps.gschema.valid \
+ gschemas.compiled \
+- $(gsettings_SCHEMAS) \
+ $(NULL)
+
+ # For uninstalled use
+diff --git a/data/org.gnome.Maps.gschema.xml b/data/org.gnome.Maps.gschema.xml
+new file mode 100644
+index 0000000..f4415ff
+--- /dev/null
++++ b/data/org.gnome.Maps.gschema.xml
+@@ -0,0 +1,49 @@
++<schemalist gettext-domain="gnome-maps">
++ <schema id="org.gnome.Maps" path="/org/gnome/maps/">
++ <key name="window-size" type="ai">
++ <default>[768, 600]</default>
++ <summary>Window size</summary>
++ <description>Window size (width and height).</description>
++ </key>
++ <key name="window-position" type="ai">
++ <default>[]</default>
++ <summary>Window position</summary>
++ <description>Window position (X and Y).</description>
++ </key>
++ <key name="window-maximized" type="b">
++ <default>true</default>
++ <summary>Window maximized</summary>
++ <description>Window maximization state</description>
++ </key>
++ <key name="max-search-results" type="i">
++ <default>100</default>
++ <summary>Maximum number of search results</summary>
++ <description>Maximum number of search results from geocode search.</description>
++ </key>
++ <key name="recent-places-limit" type="i">
++ <default>50</default>
++ <summary>Number of recent places to store</summary>
++ <description>Number of recently visited places to store.</description>
++ </key>
++ <key name="checkin-facebook-privacy" type="s">
++ <default>"EVERYONE"</default>
++ <summary>Facebook check-in privacy setting</summary>
++ <description>Latest used Facebook check-in privacy setting. Possible values are: EVERYONE, FRIENDS_OF_FRIENDS, ALL_FRIENDS or SELF.</description>
++ </key>
++ <key name="checkin-foursquare-privacy" type="s">
++ <default>"public"</default>
++ <summary>Foursquare check-in privacy setting</summary>
++ <description>Latest used Foursquare check-in privacy setting. Possible values are: public, followers or private.</description>
++ </key>
++ <key name="checkin-foursquare-broadcast-facebook" type="b">
++ <default>false</default>
++ <summary>Foursquare check-in Facebook broadcasting</summary>
++ <description>Indicates if Foursquare should broadcast the check-in as a post in the Facebook account associated with the Foursquare account.</description>
++ </key>
++ <key name="checkin-foursquare-broadcast-twitter" type="b">
++ <default>false</default>
++ <summary>Foursquare check-in Twitter broadcasting</summary>
++ <description>Indicates if Foursquare should broadcast the check-in as a tweet in the Twitter account associated with the Foursquare account.</description>
++ </key>
++ </schema>
++</schemalist>
+diff --git a/data/org.gnome.Maps.gschema.xml.in b/data/org.gnome.Maps.gschema.xml.in
+deleted file mode 100644
+index 6492678..0000000
+--- a/data/org.gnome.Maps.gschema.xml.in
++++ /dev/null
+@@ -1,49 +0,0 @@
+-<schemalist gettext-domain="gnome-maps">
+- <schema id="org.gnome.Maps" path="/org/gnome/maps/">
+- <key name="window-size" type="ai">
+- <default>[768, 600]</default>
+- <_summary>Window size</_summary>
+- <_description>Window size (width and height).</_description>
+- </key>
+- <key name="window-position" type="ai">
+- <default>[]</default>
+- <_summary>Window position</_summary>
+- <_description>Window position (X and Y).</_description>
+- </key>
+- <key name="window-maximized" type="b">
+- <default>true</default>
+- <_summary>Window maximized</_summary>
+- <_description>Window maximization state</_description>
+- </key>
+- <key name="max-search-results" type="i">
+- <default>100</default>
+- <_summary>Maximum number of search results</_summary>
+- <_description>Maximum number of search results from geocode search.</_description>
+- </key>
+- <key name="recent-places-limit" type="i">
+- <default>50</default>
+- <_summary>Number of recent places to store</_summary>
+- <_description>Number of recently visited places to store.</_description>
+- </key>
+- <key name="checkin-facebook-privacy" type="s">
+- <default>"EVERYONE"</default>
+- <_summary>Facebook check-in privacy setting</_summary>
+- <_description>Latest used Facebook check-in privacy setting. Possible values are: EVERYONE, FRIENDS_OF_FRIENDS, ALL_FRIENDS or SELF.</_description>
+- </key>
+- <key name="checkin-foursquare-privacy" type="s">
+- <default>"public"</default>
+- <_summary>Foursquare check-in privacy setting</_summary>
+- <_description>Latest used Foursquare check-in privacy setting. Possible values are: public, followers or private.</_description>
+- </key>
+- <key name="checkin-foursquare-broadcast-facebook" type="b">
+- <default>false</default>
+- <_summary>Foursquare check-in Facebook broadcasting</_summary>
+- <_description>Indicates if Foursquare should broadcast the check-in as a post in the Facebook account associated with the Foursquare account.</_description>
+- </key>
+- <key name="checkin-foursquare-broadcast-twitter" type="b">
+- <default>false</default>
+- <_summary>Foursquare check-in Twitter broadcasting</_summary>
+- <_description>Indicates if Foursquare should broadcast the check-in as a tweet in the Twitter account associated with the Foursquare account.</_description>
+- </key>
+- </schema>
+-</schemalist>
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index fffb989..d71849b 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,7 +1,7 @@
+ [encoding: UTF-8]
+ data/org.gnome.Maps.appdata.xml.in
+ data/org.gnome.Maps.desktop.in
+-data/org.gnome.Maps.gschema.xml.in
++data/org.gnome.Maps.gschema.xml
+ [type: gettext/glade]data/ui/app-menu.ui
+ [type: gettext/glade]data/ui/check-in-dialog.ui
+ [type: gettext/glade]data/ui/context-menu.ui
Added: desktop/unstable/gnome-maps/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-maps/debian/patches/series?rev=45454&op=file
==============================================================================
--- desktop/unstable/gnome-maps/debian/patches/series (added)
+++ desktop/unstable/gnome-maps/debian/patches/series [utf-8] Thu Jul 2 07:00:53 2015
@@ -0,0 +1 @@
+schema_translation.patch
More information about the pkg-gnome-commits
mailing list