Your message dated Wed, 25 Jan 2006 22:47:15 -0800
with message-id <[EMAIL PROTECTED]>
and subject line Bug#346245: fixed in libxklavier 2.0-1
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 6 Jan 2006 16:07:26 +0000
>From [EMAIL PROTECTED] Fri Jan 06 08:07:26 2006
Return-path: <[EMAIL PROTECTED]>
Received: from srv-smtp.math.univ-rennes1.fr ([129.20.36.164])
by spohr.debian.org with esmtp (Exim 4.50)
id 1Euu7h-00045e-N4
for [EMAIL PROTECTED]; Fri, 06 Jan 2006 08:07:26 -0800
Received: from frobnitz.homelinux.net (dyn37047.math.univ-rennes1.fr
[129.20.37.47])
by srv-smtp.math.univ-rennes1.fr (Postfix) with ESMTP id 4CDBAB8A7
for <[EMAIL PROTECTED]>; Fri, 6 Jan 2006 17:06:54 +0100 (CET)
Received: from daniel by frobnitz.homelinux.net with local (Exim 4.60)
(envelope-from <[EMAIL PROTECTED]>)
id 1Euu7B-00061B-Tc
for [EMAIL PROTECTED]; Fri, 06 Jan 2006 17:06:53 +0100
To: Debian Bug Tracking System <[EMAIL PROTECTED]>
Subject: libxklavier: Diff for 2.0-0.3 NMU
From: Daniel Schepler <[EMAIL PROTECTED]>
Date: Fri, 06 Jan 2006 17:06:53 +0100
Message-ID: <[EMAIL PROTECTED]>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Delivered-To: [EMAIL PROTECTED]
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2005_01_02
--=-=-=
Package: libxklavier
Severity: normal
Version: 2.0-0.3
I've attached the patch for the 2.0-0.3 libxklavier NMU I'm uploading
soon.
-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.15-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=libxklavier-nmu.diff
Content-Description: libxklavier NMU diff
diff -urN libxklavier-2.0.old/debian/changelog libxklavier-2.0/debian/changelog
--- libxklavier-2.0.old/debian/changelog 2006-01-06 16:58:22.000000000
+0100
+++ libxklavier-2.0/debian/changelog 2006-01-06 16:50:25.000000000 +0100
@@ -1,3 +1,12 @@
+libxklavier (2.0-0.3) unstable; urgency=low
+
+ * NMU.
+ * Apply patch from Andreas Jochens to fix failure to build with gcc-4.0.
+ Closes: #314271.
+ * Drop bogus Build-Depends on xlibs.
+
+ -- Daniel Schepler <[EMAIL PROTECTED]> Fri, 6 Jan 2006 16:50:25 +0100
+
libxklavier (2.0-0.2) unstable; urgency=low
* Non-maintainer upload.
diff -urN libxklavier-2.0.old/debian/control libxklavier-2.0/debian/control
--- libxklavier-2.0.old/debian/control 2006-01-06 16:58:22.000000000 +0100
+++ libxklavier-2.0/debian/control 2006-01-06 16:49:11.000000000 +0100
@@ -2,7 +2,7 @@
Priority: optional
Section: libs
Maintainer: Filip Van Raemdonck <[EMAIL PROTECTED]>
-Build-Depends: cdbs, debhelper (>> 4), doxygen, libxml2-dev, pkg-config,
xlibs, xlibs-static-dev | xlibs-dev (<< 4.3.0), libxt-dev | xlibs-dev (<< 4.3.0)
+Build-Depends: cdbs, debhelper (>> 4), doxygen, libxml2-dev, pkg-config,
xlibs-static-dev | xlibs-dev (<< 4.3.0), libxt-dev | xlibs-dev (<< 4.3.0)
Standards-Version: 3.6.1.0
Package: libxklavier10
diff -urN libxklavier-2.0.old/libxklavier/xklavier_config.c
libxklavier-2.0/libxklavier/xklavier_config.c
--- libxklavier-2.0.old/libxklavier/xklavier_config.c 2004-11-20
00:42:44.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_config.c 2006-01-06
16:51:16.000000000 +0100
@@ -29,9 +29,9 @@
static xmlChar *_XklNodeGetXmlLangAttr( xmlNodePtr nptr )
{
if( nptr->properties != NULL &&
- !strcmp( "lang", nptr->properties[0].name ) &&
+ !strcmp( "lang", (char*)nptr->properties[0].name ) &&
nptr->properties[0].ns != NULL &&
- !strcmp( "xml", nptr->properties[0].ns->prefix ) &&
+ !strcmp( "xml", (char*)nptr->properties[0].ns->prefix ) &&
nptr->properties[0].children != NULL )
return nptr->properties[0].children->content;
else
@@ -56,7 +56,7 @@
switch ( ptr->type )
{
case XML_ELEMENT_NODE:
- if( !strcmp( ptr->name, "configItem" ) )
+ if( !strcmp( (char*)ptr->name, "configItem" ) )
break;
return False;
case XML_TEXT_NODE:
@@ -85,21 +85,21 @@
if( lang != NULL )
{
- int priority = _XklGetLanguagePriority( lang );
- if( !strcmp( nptr->name, "description" ) && ( priority >
maxDescPriority ) ) /* higher priority */
+ int priority = _XklGetLanguagePriority( (char*)lang );
+ if( !strcmp( (char*)nptr->name, "description" ) && ( priority >
maxDescPriority ) ) /* higher priority */
{
descElement = nptr;
maxDescPriority = priority;
- } else if( !strcmp( nptr->name, "shortDescription" ) && ( priority >
maxShortDescPriority ) ) /* higher priority */
+ } else if( !strcmp( (char*)nptr->name, "shortDescription" ) && (
priority > maxShortDescPriority ) ) /* higher priority */
{
shortDescElement = nptr;
maxShortDescPriority = priority;
}
} else
{
- if( !strcmp( nptr->name, "description" ) )
+ if( !strcmp( (char*)nptr->name, "description" ) )
ntDescElement = nptr;
- else if( !strcmp( nptr->name, "shortDescription" ) )
+ else if( !strcmp( (char*)nptr->name, "shortDescription" ) )
ntShortDescElement = nptr;
}
}
@@ -118,12 +118,12 @@
*/
if( nameElement != NULL && nameElement->children != NULL )
- strncat( pci->name, nameElement->children->content,
+ strncat( pci->name, (char*)nameElement->children->content,
XKL_MAX_CI_NAME_LENGTH - 1 );
if( shortDescElement != NULL && shortDescElement->children != NULL )
{
- char * lsd = _XklLocaleFromUtf8( shortDescElement->children->content );
+ char * lsd = _XklLocaleFromUtf8(
(char*)shortDescElement->children->content );
strncat( pci->shortDescription,
lsd,
XKL_MAX_CI_SHORT_DESC_LENGTH - 1 );
@@ -132,7 +132,7 @@
if( descElement != NULL && descElement->children != NULL )
{
- char * ld = _XklLocaleFromUtf8( descElement->children->content );
+ char * ld = _XklLocaleFromUtf8( (char*)descElement->children->content );
strncat( pci->description,
ld,
XKL_MAX_CI_DESC_LENGTH - 1 );
@@ -185,7 +185,7 @@
if( !_XklConfigRegistryIsInitialized( ) )
return;
snprintf( xpathExpr, sizeof xpathExpr, format, value );
- xpathObj = xmlXPathEval( xpathExpr, theRegistry.xpathContext );
+ xpathObj = xmlXPathEval( (unsigned char*)xpathExpr, theRegistry.xpathContext
);
if( xpathObj != NULL )
{
_XklConfigEnumFromNodeSet( xpathObj->nodesetval, func, userData );
@@ -207,7 +207,7 @@
return False;
snprintf( xpathExpr, sizeof xpathExpr, format, arg1, ptr->name );
- xpathObj = xmlXPathEval( xpathExpr, theRegistry.xpathContext );
+ xpathObj = xmlXPathEval( (unsigned char*)xpathExpr, theRegistry.xpathContext
);
if( xpathObj == NULL )
return False;
@@ -364,10 +364,10 @@
void XklConfigInit( void )
{
xmlXPathInit( );
- modelsXPath = xmlXPathCompile( "/xkbConfigRegistry/modelList/model" );
- layoutsXPath = xmlXPathCompile( "/xkbConfigRegistry/layoutList/layout" );
+ modelsXPath = xmlXPathCompile( (unsigned
char*)"/xkbConfigRegistry/modelList/model" );
+ layoutsXPath = xmlXPathCompile( (unsigned
char*)"/xkbConfigRegistry/layoutList/layout" );
optionGroupsXPath =
- xmlXPathCompile( "/xkbConfigRegistry/optionList/group" );
+ xmlXPathCompile( (unsigned char*)"/xkbConfigRegistry/optionList/group" );
_XklI18NInit( );
_XklEnsureVTableInited();
@@ -455,10 +455,10 @@
{
Bool allowMC = True;
xmlChar *allowMCS =
- xmlGetProp( *theNodePtr, "allowMultipleSelection" );
+ xmlGetProp( *theNodePtr, (unsigned char*)"allowMultipleSelection" );
if( allowMCS != NULL )
{
- allowMC = strcmp( "false", allowMCS );
+ allowMC = strcmp( "false", (char*)allowMCS );
xmlFree( allowMCS );
}
@@ -516,11 +516,11 @@
if( rv && allowMultipleSelection != NULL )
{
- xmlChar *val = xmlGetProp( node, "allowMultipleSelection" );
+ xmlChar *val = xmlGetProp( node, (unsigned char*)"allowMultipleSelection"
);
*allowMultipleSelection = False;
if( val != NULL )
{
- *allowMultipleSelection = !strcmp( val, "true" );
+ *allowMultipleSelection = !strcmp( (char*)val, "true" );
xmlFree( val );
}
}
diff -urN libxklavier-2.0.old/libxklavier/xklavier_private_xmm.h
libxklavier-2.0/libxklavier/xklavier_private_xmm.h
--- libxklavier-2.0.old/libxklavier/xklavier_private_xmm.h 2005-01-07
15:17:33.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_private_xmm.h 2006-01-06
16:51:16.000000000 +0100
@@ -35,11 +35,11 @@
extern const char* _XklXmmGetCurrentShortcutOptionName( void );
-extern const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void );
+extern XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void );
extern void _XklXmmActualizeGroup( int group );
-extern const XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
+extern XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
unsigned state,
int *
currentShortcut_rv );
diff -urN libxklavier-2.0.old/libxklavier/xklavier_util.c
libxklavier-2.0/libxklavier/xklavier_util.c
--- libxklavier-2.0.old/libxklavier/xklavier_util.c 2004-12-09
00:33:45.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_util.c 2006-01-06 16:51:16.000000000
+0100
@@ -27,7 +27,7 @@
if( Success == XGetWindowProperty( _xklDpy, w, _xklAtoms[WM_NAME], 0L,
-1L, False, XA_STRING, &type_ret,
&format_ret, &nitems, &rest, &prop ) )
- return prop;
+ return (char*)prop;
else
return NULL;
}
@@ -178,7 +178,7 @@
Window _XklGetRegisteredParent( Window win )
{
Window parent = ( Window ) NULL, rw = ( Window ) NULL, *children = NULL;
- unsigned nchildren = 0;
+ int nchildren = 0;
_xklLastErrorCode =
_XklStatusQueryTree( _xklDpy, win, &rw, &parent, &children, &nchildren );
@@ -205,7 +205,7 @@
w,
root_return,
parent_return,
- children_return, nchildren_return );
+ children_return, (unsigned*)nchildren_return );
if( !result )
{
XklDebug( 160,
diff -urN libxklavier-2.0.old/libxklavier/xklavier_xmm.c
libxklavier-2.0/libxklavier/xklavier_xmm.c
--- libxklavier-2.0.old/libxklavier/xklavier_xmm.c 2005-01-07
15:20:23.000000000 +0100
+++ libxklavier-2.0/libxklavier/xklavier_xmm.c 2006-01-06 16:51:16.000000000
+0100
@@ -63,7 +63,7 @@
}
}
-const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
+XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
{
const char* optionName = _XklXmmGetCurrentShortcutOptionName();
XklDebug( 150, "Configured switch option: [%s]\n", optionName );
@@ -94,7 +94,7 @@
return NULL;
}
-const XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
+XmmSwitchOptionPtr _XklXmmFindSwitchOption( unsigned keycode,
unsigned state,
int* currentShortcut_rv )
{
--=-=-=--
---------------------------------------
Received: (at 346245-close) by bugs.debian.org; 26 Jan 2006 06:50:21 +0000
>From [EMAIL PROTECTED] Wed Jan 25 22:50:21 2006
Return-path: <[EMAIL PROTECTED]>
Received: from katie by spohr.debian.org with local (Exim 4.50)
id 1F20uZ-0002ic-71; Wed, 25 Jan 2006 22:47:15 -0800
From: Filip Van Raemdonck <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED]
X-Katie: $Revision: 1.65 $
Subject: Bug#346245: fixed in libxklavier 2.0-1
Message-Id: <[EMAIL PROTECTED]>
Sender: Archive Administrator <[EMAIL PROTECTED]>
Date: Wed, 25 Jan 2006 22:47:15 -0800
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level:
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2005_01_02
Source: libxklavier
Source-Version: 2.0-1
We believe that the bug you reported is fixed in the latest version of
libxklavier, which is due to be installed in the Debian FTP archive:
libxklavier-dev_2.0-1_i386.deb
to pool/main/libx/libxklavier/libxklavier-dev_2.0-1_i386.deb
libxklavier10_2.0-1_i386.deb
to pool/main/libx/libxklavier/libxklavier10_2.0-1_i386.deb
libxklavier_2.0-1.diff.gz
to pool/main/libx/libxklavier/libxklavier_2.0-1.diff.gz
libxklavier_2.0-1.dsc
to pool/main/libx/libxklavier/libxklavier_2.0-1.dsc
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Filip Van Raemdonck <[EMAIL PROTECTED]> (supplier of updated libxklavier
package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Tue, 24 Jan 2006 21:24:41 +0100
Source: libxklavier
Binary: libxklavier10 libxklavier-dev
Architecture: source i386
Version: 2.0-1
Distribution: unstable
Urgency: low
Maintainer: Filip Van Raemdonck <[EMAIL PROTECTED]>
Changed-By: Filip Van Raemdonck <[EMAIL PROTECTED]>
Description:
libxklavier-dev - Development files for libxklavier0
libxklavier10 - X Keyboard Extension high-level API
Closes: 285606 314271 336791 346245
Changes:
libxklavier (2.0-1) unstable; urgency=low
.
* Acknowledge NMUs. (Closes: #285606, #314271, #346245)
* Don't get confused by xorg.xml comments, patch by Sam Morris.
(Closes: #336791)
* Remove xlibs-dev references from builddeps.
Files:
62bccdb50648b15122784f70923256a7 666 libs optional libxklavier_2.0-1.dsc
e80ec6419df10f954cbb18865e0327f6 13409 libs optional libxklavier_2.0-1.diff.gz
b6b21433a5c6dd639f7b506fa928bba2 69464 libs optional
libxklavier10_2.0-1_i386.deb
bc0ea1d51ff488852b5bf510022c6bc1 83730 libdevel optional
libxklavier-dev_2.0-1_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFD2GwrEjn3CY6VDgARAlY7AJwJz+LcQs5SbPVQTCPxFu/kO5mymQCgjEWS
iKwyIFCcKOfaxuM/mo+JVQU=
=LDQn
-----END PGP SIGNATURE-----
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
