r31069 - in /desktop/unstable/gconf/debian: changelog control control.in copyright gconf2.postinst gconf2.postrm gconf2.triggers patches/02_fix_wrong_return_value.patch rules watch
jbicha-guest at users.alioth.debian.org
jbicha-guest at users.alioth.debian.org
Thu Oct 27 02:38:21 UTC 2011
Author: jbicha-guest
Date: Thu Oct 27 02:38:21 2011
New Revision: 31069
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31069
Log:
* New upstream release
* debian/control.in:
- Use GTK 3
- Drop orbit dependency
* debian/copyright: Fixed lintian warning
* debian/rules:
- Explicity disable orbit
* debian/watch: Switch to .xz tarballs
* 02_fix_wrong_return_value.patch: Updated
* gconf2.postinst, gconf2.postrm, gconf2.triggers
- Updated for gsettings conversion
Modified:
desktop/unstable/gconf/debian/changelog
desktop/unstable/gconf/debian/control
desktop/unstable/gconf/debian/control.in
desktop/unstable/gconf/debian/copyright
desktop/unstable/gconf/debian/gconf2.postinst
desktop/unstable/gconf/debian/gconf2.postrm
desktop/unstable/gconf/debian/gconf2.triggers
desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch
desktop/unstable/gconf/debian/rules
desktop/unstable/gconf/debian/watch
Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Thu Oct 27 02:38:21 2011
@@ -1,3 +1,20 @@
+gconf (3.2.2-1) UNRELEASED; urgency=low
+
+ [ Jeremy Bicha ]
+ * New upstream release
+ * debian/control.in:
+ - Use GTK 3
+ - Drop orbit dependency
+ * debian/copyright: Fixed lintian warning
+ * debian/rules:
+ - Explicity disable orbit
+ * debian/watch: Switch to .xz tarballs
+ * 02_fix_wrong_return_value.patch: Updated
+ * gconf2.postinst, gconf2.postrm, gconf2.triggers
+ - Updated for gsettings conversion
+
+ -- Jeremy Bicha <jbicha at ubuntu.com> Wed, 26 Oct 2011 22:37:00 -0400
+
gconf (2.32.4-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Thu Oct 27 02:38:21 2011
@@ -13,11 +13,10 @@
gnome-pkg-tools (>= 0.14),
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.25.9),
- liborbit2-dev (>= 1:2.10.2-1.1),
libdbus-1-dev (>= 1.0.0),
libdbus-glib-1-dev (>= 0.74),
libxml2-dev,
- libgtk2.0-dev,
+ libgtk-3-dev,
libpolkit-gobject-1-dev,
libldap2-dev,
intltool (>= 0.35.0),
@@ -44,7 +43,7 @@
psmisc,
dbus-x11,
${python:Depends}
-Recommends: libgtk2.0-0
+Recommends: libgtk-3-0
Suggests: gconf-defaults-service
Conflicts: libgconf2-4 (<< 2.12.0-2)
Description: GNOME configuration database system (support tools)
@@ -114,7 +113,6 @@
libgconf2-4 (= ${binary:Version}),
gir1.2-gconf-2.0 (= ${binary:Version}),
libglib2.0-dev (>= 2.25.9),
- liborbit2-dev (>= 1:2.10.2-1.1),
libdbus-1-dev (>= 1.0.0),
gconf2 (= ${binary:Version})
Replaces: gconf2 (<< 2.12.0-2),
Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Thu Oct 27 02:38:21 2011
@@ -8,11 +8,10 @@
gnome-pkg-tools (>= 0.14),
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.25.9),
- liborbit2-dev (>= 1:2.10.2-1.1),
libdbus-1-dev (>= 1.0.0),
libdbus-glib-1-dev (>= 0.74),
libxml2-dev,
- libgtk2.0-dev,
+ libgtk-3-dev,
libpolkit-gobject-1-dev,
libldap2-dev,
intltool (>= 0.35.0),
@@ -39,7 +38,7 @@
psmisc,
dbus-x11,
${python:Depends}
-Recommends: libgtk2.0-0
+Recommends: libgtk-3-0
Suggests: gconf-defaults-service
Conflicts: libgconf2-4 (<< 2.12.0-2)
Description: GNOME configuration database system (support tools)
@@ -109,7 +108,6 @@
libgconf2-4 (= ${binary:Version}),
gir1.2-gconf-2.0 (= ${binary:Version}),
libglib2.0-dev (>= 2.25.9),
- liborbit2-dev (>= 1:2.10.2-1.1),
libdbus-1-dev (>= 1.0.0),
gconf2 (= ${binary:Version})
Replaces: gconf2 (<< 2.12.0-2),
Modified: desktop/unstable/gconf/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/copyright?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/copyright [utf-8] (original)
+++ desktop/unstable/gconf/debian/copyright [utf-8] Thu Oct 27 02:38:21 2011
@@ -32,5 +32,5 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU Lesser General
-Public License can be found in `/usr/share/common-licenses/LGPL'.
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
Modified: desktop/unstable/gconf/debian/gconf2.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2.postinst?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf2.postinst [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf2.postinst [utf-8] Thu Oct 27 02:38:21 2011
@@ -19,6 +19,9 @@
;;
/usr/share/gconf/mandatory)
update-gconf-defaults --no-signal --mandatory
+ ;;
+ /usr/share/GConf/gsettings)
+ check_for_new_convert_files
;;
esac
done
@@ -52,5 +55,6 @@
gconf-schemas --register-all --no-signal
update-gconf-defaults --no-signal
update-gconf-defaults --no-signal --mandatory
+check_for_new_convert_files
signal_daemons
Modified: desktop/unstable/gconf/debian/gconf2.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2.postrm?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf2.postrm [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf2.postrm [utf-8] Thu Oct 27 02:38:21 2011
@@ -5,6 +5,7 @@
if [ -d /var/lib/gconf ]; then
find /var/lib/gconf -mindepth 2 -maxdepth 2 -exec rm -rf \{} \;
fi
+ rm -f /usr/share/GConf/gsettings.dpkg-cache
fi
#DEBHELPER#
Modified: desktop/unstable/gconf/debian/gconf2.triggers
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/gconf2.triggers?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/gconf2.triggers [utf-8] (original)
+++ desktop/unstable/gconf/debian/gconf2.triggers [utf-8] Thu Oct 27 02:38:21 2011
@@ -1,3 +1,4 @@
interest /usr/share/gconf/defaults
interest /usr/share/gconf/mandatory
interest /usr/share/gconf/schemas
+interest /usr/share/GConf/gsettings
Modified: desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/02_fix_wrong_return_value.patch [utf-8] Thu Oct 27 02:38:21 2011
@@ -4,12 +4,21 @@
--- a/gconf/gconf-client.c
+++ b/gconf/gconf-client.c
-@@ -2163,7 +2163,7 @@
- {
- g_free (dir);
- trace ("Negative cache hit on %s", key);
-- return TRUE;
-+ return FALSE;
- }
-
- g_free (dir);
+@@ -2373,7 +2373,7 @@ gconf_client_lookup (GConfClient *client
+ {
+ g_free (dir);
+ trace ("Negative cache hit on %s", key);
+- return TRUE;
++ return FALSE;
+ }
+ else
+ {
+@@ -2389,7 +2389,7 @@ gconf_client_lookup (GConfClient *client
+ {
+ g_free (dir);
+ trace ("Non-existing dir for %s", key);
+- return TRUE;
++ return FALSE;
+ }
+ not_cached = TRUE;
+ }
Modified: desktop/unstable/gconf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/rules?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/rules [utf-8] (original)
+++ desktop/unstable/gconf/debian/rules [utf-8] Thu Oct 27 02:38:21 2011
@@ -22,7 +22,7 @@
DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO
DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 \
- --with-gtk=2.0
+ --with-gtk=3.0 --disable-orbit
DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4
LDFLAGS += -Wl,-z,defs -Wl,--as-needed
Modified: desktop/unstable/gconf/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/watch?rev=31069&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/watch [utf-8] (original)
+++ desktop/unstable/gconf/debian/watch [utf-8] Thu Oct 27 02:38:21 2011
@@ -1,2 +1,2 @@
version=2
-http://ftp.gnome.org/pub/gnome/sources/GConf/([\d\.]+)[02468]/GConf-([\d\.]+)\.tar\.bz2
+http://ftp.gnome.org/pub/gnome/sources/GConf/([\d\.]+)[02468]/GConf-([\d\.]+)\.tar\.xz
More information about the pkg-gnome-commits
mailing list