diff -Nru gnome-maps-3.10.2/debian/changelog gnome-maps-3.10.2/debian/changelog --- gnome-maps-3.10.2/debian/changelog 2014-02-12 05:56:43.000000000 +0000 +++ gnome-maps-3.10.2/debian/changelog 2014-02-20 23:37:10.000000000 +0000 @@ -1,3 +1,22 @@ +gnome-maps (3.10.2-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/git_remove_e4x.patch: + + Remove e4x in preparation for spidermonkey 24. + - debian/watch: + + Watch for stable releases. + + -- Artur Rona Fri, 21 Feb 2014 00:35:47 +0100 + +gnome-maps (3.10.2-1) unstable; urgency=medium + + * New upstream release + * debian/control.in: Add dependency against gjs package + * debian/control.in: Depends against geoclue-2.0 package + * debian/control.in: Bump Standards-Version to 3.9.5 (no further changes) + + -- Laurent Bigonville Sun, 16 Feb 2014 12:10:22 +0100 + gnome-maps (3.10.2-0ubuntu1) trusty; urgency=medium * New upstream release diff -Nru gnome-maps-3.10.2/debian/control gnome-maps-3.10.2/debian/control --- gnome-maps-3.10.2/debian/control 2014-02-12 05:56:46.000000000 +0000 +++ gnome-maps-3.10.2/debian/control 2014-02-20 23:40:23.000000000 +0000 @@ -7,21 +7,21 @@ Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Laurent Bigonville Build-Depends: debhelper (>= 8.0.0), dh-autoreconf, gnome-common, gnome-pkg-tools, libgjs-dev, libglib2.0-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: https://wiki.gnome.org/Apps/Maps Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-maps Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-maps Package: gnome-maps Architecture: any -Depends: geoclue-2.0, +Depends: geoclue-2.0 (>= 2.0), gir1.2-champlain-0.12, gir1.2-clutter-1.0, gir1.2-cogl-1.0, @@ -31,6 +31,7 @@ gir1.2-gtk-3.0 (>= 3.10), gir1.2-gtkchamplain-0.12, gir1.2-gtkclutter-1.0, + gjs, ${misc:Depends}, ${shlibs:Depends} Description: map application for GNOME diff -Nru gnome-maps-3.10.2/debian/control.in gnome-maps-3.10.2/debian/control.in --- gnome-maps-3.10.2/debian/control.in 2014-01-15 11:21:12.000000000 +0000 +++ gnome-maps-3.10.2/debian/control.in 2014-02-18 23:37:25.000000000 +0000 @@ -10,14 +10,14 @@ gnome-pkg-tools, libgjs-dev, libglib2.0-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: https://wiki.gnome.org/Apps/Maps Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-maps Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-maps Package: gnome-maps Architecture: any -Depends: geoclue-2.0, +Depends: geoclue-2.0 (>= 2.0), gir1.2-champlain-0.12, gir1.2-clutter-1.0, gir1.2-cogl-1.0, @@ -27,6 +27,7 @@ gir1.2-gtk-3.0 (>= 3.10), gir1.2-gtkchamplain-0.12, gir1.2-gtkclutter-1.0, + gjs, ${misc:Depends}, ${shlibs:Depends} Description: map application for GNOME