Here's the changelog entry:
mlterm (3.0.1-2) unstable; urgency=low
* debian/control: Bumped Standards-Version to 3.9.1
* Added numlock.diff patch, to add XK_Num_Lock to default_keysyms in
x_window_get_mod_ignore_mask() (Closes: #597380)
Please find the debdiff attached.
Please CC me on replies, since I am not subscribed to the list.
Thanks...
--
أحمد المحمودي (Ahmed El-Mahmoudy)
Digital design engineer
GPG KeyID: 0xEDDDA1B7
GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7
diff --git a/debian/changelog b/debian/changelog
index ac70fbe..a5c0991 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+mlterm (3.0.1-2) unstable; urgency=low
+
+ * Added numlock.diff patch, to add XK_Num_Lock to default_keysyms in
+ x_window_get_mod_ignore_mask() (Closes: #597380)
+ * debian/control:
+ + Bumped Standards-Version to 3.9.1
+ + Use Breaks/Replaces mlterm (<= 2.8.0.cvs20040403-2) for mlterm-tools
+ instead of Conflicts
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org> Sat, 25 Sep 2010 04:25:14 +0300
+
mlterm (3.0.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index dd7a511..b4fedac 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Kenshi Muto <kmuto@debian.org>
Uploaders: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy@sabily.org>
Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev, libtool, libx11-dev, libxext-dev, libxft-dev, x11proto-core-dev, libfribidi-dev, libxrender-dev, libuim-dev (>= 1.4.1), libm17n-dev, libscim-dev, libgcroots-dev, libxml2-dev, libthai-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://mlterm.sourceforge.net
Vcs-Git: git://git.debian.org/git/collab-maint/mlterm.git
Vcs-Browser: http://git.debian.org/?p=collab-maint/mlterm.git
@@ -85,7 +85,8 @@ Description: MultiLingual TERMinal, common files
Package: mlterm-tools
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, mlterm-common (>= 2.9.4-1), mlterm (= ${binary:Version}) | mlterm-tiny (= ${binary:Version})
-Conflicts: mlterm (<= 2.8.0.cvs20040403-2)
+Breaks: mlterm (<= 2.8.0.cvs20040403-2)
+Replaces: mlterm (<= 2.8.0.cvs20040403-2)
Description: MultiLingual TERMinal, additional tools
mlterm is a terminal emulator for X Window System, which supports
various encodings, doublewidth characters, BiDi, Arabic shaping,
diff --git a/debian/patches/numlock.diff b/debian/patches/numlock.diff
new file mode 100644
index 0000000..060560b
--- /dev/null
+++ b/debian/patches/numlock.diff
@@ -0,0 +1,72 @@
+Description: x_window.c: XK_Num_Lock is added to default_keysyms in
+ x_window_get_mod_ignore_mask() to fix SF Bug #3072833 which was caused by
+ 2010-06-03 fix. (Thanks to Andreas Metzler)
+Origin: http://mlterm.hg.sourceforge.net/hgweb/mlterm/mlterm/rev/b9156f7459b3
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3072833&group_id=40891&atid=429201
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597380
+Author: Araki Ken <arakiken@users.sf.net>
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,10 @@
++2010-09-25 Araki Ken <arakiken@users.sf.net>
++
++ * x_window.c: XK_Num_Lock is added to default_keysyms in
++ x_window_get_mod_ignore_mask() to fix SF Bug #3072833
++ which was caused by 2010-06-03 fix.
++ (Thanks to Andreas Metzler)
++
+ 2010-06-07 Araki Ken <arakiken@users.sf.net>
+
+ * 3.0.1 released.
+--- a/xwindow/x_screen.c
++++ b/xwindow/x_screen.c
+@@ -2056,7 +2056,7 @@
+ is_app_cursor_keys = ml_term_is_app_cursor_keys( screen->term) ;
+ is_app_keypad = ml_term_is_app_keypad( screen->term) ;
+
+- if ( event->state)
++ if ( event->state) /* Check unmasked (raw) state of event. */
+ {
+ int is_shift ;
+ int is_meta ;
+@@ -2209,7 +2209,7 @@
+ }
+ else
+ {
+- return ;
++ goto no_keypad ;
+ }
+
+ goto write_buf ;
+@@ -2238,7 +2238,8 @@
+ sizeof(table) / sizeof(table[0])) ;
+ }
+ }
+-
++
++no_keypad:
+ if( ( buf = x_shortcut_str( screen->shortcut , ksym , masked_state)))
+ {
+ if( strncmp( buf , "proto:" , 6) == 0)
+@@ -2583,6 +2584,7 @@
+
+ buf = buf_escseq ;
+ }
++ /* Check unmasked (raw) state of event. */
+ else if( screen->mod_meta_mask & event->state)
+ {
+ if( screen->mod_meta_mode == MOD_META_OUTPUT_ESC)
+--- a/xwindow/x_window.c
++++ b/xwindow/x_window.c
+@@ -3347,8 +3347,8 @@
+ int count ;
+ u_int ignore ;
+ u_int masks[] = { Mod1Mask , Mod2Mask , Mod3Mask , Mod4Mask , Mod5Mask } ;
+- KeySym default_keysyms[] = { XK_Scroll_Lock, XK_ISO_Level3_Lock,
+- NoSymbol} ;
++ KeySym default_keysyms[] = { XK_Num_Lock , XK_Scroll_Lock , XK_ISO_Level3_Lock ,
++ NoSymbol } ;
+
+ if( !keysyms)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 9b521cb..96ee989 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
disable_rpath.diff
consistent_manpage.diff
+numlock.diff
Attachment:
signature.asc
Description: Digital signature