r14243 - in /desktop/unstable/gok/debian: changelog control control.in gok.menu patches/10-fix-cish-code.patch

manphiz-guest at users.alioth.debian.org manphiz-guest at users.alioth.debian.org
Wed Jan 16 07:42:08 UTC 2008


Author: manphiz-guest
Date: Wed Jan 16 07:42:08 2008
New Revision: 14243

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14243
Log:
* New upstream version.
  + Content no longer changes when built twice or more times in a
    row. (Closes: #441705)
* debian/control{,in}
  + Bump standard version to 3.7.3.
  + Bump libwnck-dev build-dep to >= 2.13.5 accordingly.
  + Add libglade2-dev build-dep accordingly.
  + Add doc-base in Depends of gok-doc. 
  + Wrap Depends fields.
* debian/gok.menu
  + Fix section to Application/Tools.
  + Add icon file.
* debian/patches
  + Add 10-fix-cish-code.patch from Anrelien Jarno <anrel32 at debian.org>.
    (Closes: #460863)

Added:
    desktop/unstable/gok/debian/patches/10-fix-cish-code.patch
Modified:
    desktop/unstable/gok/debian/changelog
    desktop/unstable/gok/debian/control
    desktop/unstable/gok/debian/control.in
    desktop/unstable/gok/debian/gok.menu

Modified: desktop/unstable/gok/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gok/debian/changelog?rev=14243&op=diff
==============================================================================
--- desktop/unstable/gok/debian/changelog (original)
+++ desktop/unstable/gok/debian/changelog Wed Jan 16 07:42:08 2008
@@ -1,9 +1,27 @@
-gok (1.2.5-2) UNRELEASED; urgency=low
-
+gok (1.3.7-1) UNRELEASED; urgency=low
+
+  [ Mario Lang ]
   * debian/control.in: Remove myself from Uploaders, gnome-pkg-tools
     takes care of this now.
 
- -- Mario Lang <mlang at debian.org>  Thu, 14 Jun 2007 12:51:27 +0200
+  [ Deng Xiyue ]
+  * New upstream version.
+    + Content no longer changes when built twice or more times in a
+      row. (Closes: #441705)
+  * debian/control{,in}
+    + Bump standard version to 3.7.3.
+    + Bump libwnck-dev build-dep to >= 2.13.5 accordingly.
+    + Add libglade2-dev build-dep accordingly.
+    + Add doc-base in Depends of gok-doc. 
+    + Wrap Depends fields.
+  * debian/gok.menu
+    + Fix section to Application/Tools.
+    + Add icon file.
+  * debian/patches
+    + Add 10-fix-cish-code.patch from Anrelien Jarno <anrel32 at debian.org>.
+      (Closes: #460863)
+
+ -- Mario Lang <mlang at debian.org>  Wed, 16 Jan 2008 13:08:26 +0800
 
 gok (1.2.5-1) unstable; urgency=low
 

Modified: desktop/unstable/gok/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gok/debian/control?rev=14243&op=diff
==============================================================================
--- desktop/unstable/gok/debian/control (original)
+++ desktop/unstable/gok/debian/control Wed Jan 16 07:42:08 2008
@@ -15,7 +15,7 @@
                libgtk2.0-dev (>= 2.4.0),
                libgail-dev (>= 1.4.0),
                libgnome-speech-dev,
-               libwnck-dev (>= 2.10.0),
+               libwnck-dev (>= 2.13.5),
                libgconf2-dev (>= 1.2.1),
                pkg-config,
                liborbit2-dev,
@@ -25,13 +25,16 @@
                libxt-dev,
                libglib2.0-dev (>= 2.11),
                libxext-dev,
-               libusb-dev
+               libusb-dev,
+	       libglade2-dev
 Build-Depends-Indep: gtk-doc-tools (>= 0.6), docbook-xml
 Standards-Version: 3.7.2
 
 Package: gok
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, at-spi
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         at-spi
 Suggests: gok-doc
 Description: GNOME Onscreen Keyboard
  GOK is the GNOME Onscreen keyboard, a dynamic onscreen keyboard for
@@ -48,7 +51,9 @@
 Package: gok-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, lynx | www-browser
+Depends: ${misc:Depends},
+         lynx | www-browser,
+         doc-base
 Description: documentation files for the GNOME Onscreen Keyboard
  GOK is the GNOME Onscreen keyboard, a dynamic onscreen keyboard for
  UNIX and UNIX-like operating systems. It features Direct Selection,

Modified: desktop/unstable/gok/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gok/debian/control.in?rev=14243&op=diff
==============================================================================
--- desktop/unstable/gok/debian/control.in (original)
+++ desktop/unstable/gok/debian/control.in Wed Jan 16 07:42:08 2008
@@ -15,7 +15,7 @@
                libgtk2.0-dev (>= 2.4.0),
                libgail-dev (>= 1.4.0),
                libgnome-speech-dev,
-               libwnck-dev (>= 2.10.0),
+               libwnck-dev (>= 2.13.5),
                libgconf2-dev (>= 1.2.1),
                pkg-config,
                liborbit2-dev,
@@ -25,13 +25,16 @@
                libxt-dev,
                libglib2.0-dev (>= 2.11),
                libxext-dev,
-               libusb-dev
+               libusb-dev,
+	       libglade2-dev
 Build-Depends-Indep: gtk-doc-tools (>= 0.6), docbook-xml
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 
 Package: gok
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, at-spi
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         at-spi
 Suggests: gok-doc
 Description: GNOME Onscreen Keyboard
  GOK is the GNOME Onscreen keyboard, a dynamic onscreen keyboard for
@@ -48,7 +51,9 @@
 Package: gok-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, lynx | www-browser
+Depends: ${misc:Depends},
+         lynx | www-browser,
+         doc-base
 Description: documentation files for the GNOME Onscreen Keyboard
  GOK is the GNOME Onscreen keyboard, a dynamic onscreen keyboard for
  UNIX and UNIX-like operating systems. It features Direct Selection,

Modified: desktop/unstable/gok/debian/gok.menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gok/debian/gok.menu?rev=14243&op=diff
==============================================================================
--- desktop/unstable/gok/debian/gok.menu (original)
+++ desktop/unstable/gok/debian/gok.menu Wed Jan 16 07:42:08 2008
@@ -1,3 +1,6 @@
-?package(gok):needs="X11" section="Apps/Tools" \
+?package(gok):\
+  needs="X11" \
+  section="Applications/Tools" \
   title="The GNOME Onscreen Keyboard" \
+  icon="/usr/share/pixmaps/gok.png" \
   command="/usr/bin/gok"

Added: desktop/unstable/gok/debian/patches/10-fix-cish-code.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gok/debian/patches/10-fix-cish-code.patch?rev=14243&op=file
==============================================================================
--- desktop/unstable/gok/debian/patches/10-fix-cish-code.patch (added)
+++ desktop/unstable/gok/debian/patches/10-fix-cish-code.patch Wed Jan 16 07:42:08 2008
@@ -1,0 +1,19 @@
+--- gok-1.2.5.orig/gok/gok-libusb.c
++++ gok-1.2.5/gok/gok-libusb.c
+@@ -261,7 +261,7 @@
+ 					/* check if the device is attached to a kernel driver and attempt to detach if it is
+ 					 * if the OS doesn't support detaching from the kernel driver, just try to claim the interface anyway
+ 					 */
+-					if (LIBUSB_HAS_GET_DRIVER_NP && LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
++#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+ 					{ 
+ 						gchar *driver_name = g_malloc0(128);
+ 						if (usb_get_driver_np(handle, j, driver_name, 128) >= 0) 
+@@ -283,6 +283,7 @@
+ 						}
+ 						g_free(driver_name);
+ 					}
++#endif
+ 
+ 					if (usb_claim_interface(handle, j) < 0)
+ 					{




More information about the pkg-gnome-commits mailing list