Changeset 6621

Timestamp:

07/03/10 21:57:29 (3 years ago)

Author:

alanbach-guest

Message:

• Sync'd with Debian 2.30.1-2

Location:

pkg/vinnie/main/libgnomekbd/trunk/debian

Files:

• changelog (modified) (1 diff)
• control (modified) (3 diffs)
• control.in (modified) (2 diffs)
• patches/01_requires_private.patch (modified) (1 diff)
• patches/series (modified) (1 diff)
• rules (modified) (1 diff)

pkg/vinnie/main/libgnomekbd/trunk/debian/changelog

@@ -1 @@
-libgnomekbd (1:2.28.2-parsix2) unstable; urgency=low
-
-  * Rebuilt using xklavier 4.0
-
- -- Alan Baghumian <alan@technotux.org>  Wed, 21 Apr 2010 21:32:12 -0700
-
-libgnomekbd (2.28.2-parsix1) unstable; urgency=low
-
-  * New upstream bugfix release
-
- -- Alan Baghumian <alan@technotux.org>  Sat, 02 Jan 2010 18:48:56 -0800
-
-libgnomekbd (2.28.0-parsix1) unstable; urgency=low
-
-  * Sync'd with Debian 2.28.0-1
-
- -- Alan Baghumian <alan@technotux.org>  Thu, 26 Nov 2009 17:54:16 -0800
+libgnomekbd (1:2.30.2-parsix1) unstable; urgency=low
+
+  * Sync'd with Debian 2.30.1-2
+
+ -- Alan Baghumian <alan@technotux.org>  Sat, 03 Jul 2010 12:56:48 -0700
+
+libgnomekbd (2.30.1-2) unstable; urgency=low
+
+  * 02_layout_crash.patch: stolen upstream. Fixes a crasher caused by an 
+    unitialized value. Hopefully closes: #580228.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 05 May 2010 19:02:02 +0200
+
+libgnomekbd (2.30.1-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + debian/patches/02_fontsize_schema.patch:
+      - Dropped, merged upstream.
+
+ -- Sebastian Dröge <slomo@debian.org>  Sat, 24 Apr 2010 06:22:54 +0200
+
+libgnomekbd (2.30.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * 10_gsd_crash.patch: dropped, merged upstream.
+  * 02_fontsize_schema.patch: new patch. Set a default for the font 
+    size, to avoid warnings upon installation and at runtime.
+
+ -- Josselin Mouette <joss@debian.org>  Fri, 09 Apr 2010 00:00:33 +0200
+
+libgnomekbd (2.29.92-1) experimental; urgency=low
+
+  * New upstream release candidate.
+  * Bump shlibs version.
+  * Bump libxklavier dependency.
+  * Drop D-Bus dependencies.
+  * 01_requires_private.patch: updated for the new version.
+  * 10_gsd_crash.patch: stolen upstream. Avoid a crasher.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 28 Mar 2010 11:02:15 +0200
+
+libgnomekbd (2.28.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Mon, 14 Dec 2009 19:47:46 +0100
 
 libgnomekbd (2.28.0-2) unstable; urgency=low

pkg/vinnie/main/libgnomekbd/trunk/debian/control

@@ +1 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: libgnomekbd
 Section: gnome
@@ -11 +16 @@
         quilt,
         libglib2.0-dev (>= 2.16),
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
         libgconf2-dev (>= 2.14.0),
         libgtk2.0-dev (>= 2.13),
-        libxklavier-dev (>= 4.0),
+        libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
 Standards-Version: 3.8.3
@@ -30 +33 @@
         libgtk2.0-dev (>= 2.13),
         libgconf2-dev (>= 2.14.0),
-        libxklavier-dev (>= 4.0),
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
+        libxklavier-dev (>= 5.0),
         libx11-dev
 Description: GNOME library to manage keyboard configuration - development files

pkg/vinnie/main/libgnomekbd/trunk/debian/control.in

@@ -11 +11 @@
         quilt,
         libglib2.0-dev (>= 2.16),
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
         libgconf2-dev (>= 2.14.0),
         libgtk2.0-dev (>= 2.13),
-        libxklavier-dev (>= 4.0),
+        libxklavier-dev (>= 5.0),
         intltool (>= 0.35)
 Standards-Version: 3.8.3
@@ -30 +28 @@
         libgtk2.0-dev (>= 2.13),
         libgconf2-dev (>= 2.14.0),
-        libxklavier-dev (>= 4.0),
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
+        libxklavier-dev (>= 5.0),
         libx11-dev
 Description: GNOME library to manage keyboard configuration - development files

pkg/vinnie/main/libgnomekbd/trunk/debian/patches/01_requires_private.patch

@@ -1 @@
-Index: libgnomekbd-2.24.0/libgnomekbd.pc.in
+Index: libgnomekbd-2.29.92/libgnomekbd.pc.in
 ===================================================================
---- libgnomekbd-2.24.0.orig/libgnomekbd.pc.in   2008-11-21 18:15:37.700766019 +0100
-+++ libgnomekbd-2.24.0/libgnomekbd.pc.in        2008-11-21 18:16:01.756340542 +0100
+--- libgnomekbd-2.29.92.orig/libgnomekbd.pc.in  2010-02-22 22:09:00.000000000 +0100
++++ libgnomekbd-2.29.92/libgnomekbd.pc.in       2010-03-28 11:13:14.730507782 +0200
 @@ -6,6 +6,7 @@ includedir=@includedir@
  Name: libgnomekbd
  Description: GNOME keyboard shared library
  Version: @VERSION@
--Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@
-+Requires: gmodule-export-2.0
-+Requires.private: gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@
+-Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@
++Requires: gmodule-export-2.0 
++Requires.private: gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@
  Libs: -L${libdir} -lgnomekbd
  Cflags: -I${includedir}

pkg/vinnie/main/libgnomekbd/trunk/debian/patches/series

@@ -1 +1 @@
 01_requires_private.patch
+02_layout_crash.patch
 99_ltmain_as-needed.patch

pkg/vinnie/main/libgnomekbd/trunk/debian/rules

@@ -10 +10 @@
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+DEB_DH_MAKESHLIBS_ARGS_libgnomekbd4 += -V 'libgnomekbd4 (>= 2.29.5)'