[Debian-in-commits] [SCM] iok.git branch, master, updated. upstream/1.3.13-8-g942ee0b

Kartik Mistry kartik at debian.org
Thu May 3 09:14:36 UTC 2012


The following commit has been merged in the master branch:
commit 942ee0be3c6ab4a5def13b70eae0505465c5b883
Author: Kartik Mistry <kartik at debian.org>
Date:   Thu May 3 14:44:20 2012 +0530

    New upstream release, Updated Build-Deps for GTK-3+, Updated patches

diff --git a/debian/changelog b/debian/changelog
index e537b9a..46b2a53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+iok (2.1.2-1) UNRELEASED; urgency=low
+
+  * New Upstream release.
+  * debian/control:
+    + Updated Standards-Version to 3.9.3
+    + Updated Build-Dep for GTK-3 interface.
+  * debian/rules:
+    + Removed empty directories.
+  * Updated patch: manpage-fixes.diff
+
+ -- Kartik Mistry <kartik at debian.org>  Thu, 03 May 2012 12:08:12 +0530
+
 iok (1.3.13-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 2f3508d..c309231 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,17 @@ Section: utils
 Priority: extra
 Maintainer: Debian-IN Team <debian-in-workers at lists.alioth.debian.org>
 Uploaders: Kartik Mistry <kartik at debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.50~),
                autotools-dev,
                desktop-file-utils,
                gettext,
                intltool,
-               libgtk2.0-dev (>= 2.22.0),
-               libunique-dev (>= 1.0.8),
+               libgtk-3-dev,
+               libunique-3.0-dev,
                libxtst-dev,
                libxml2-dev,
                pkg-config
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/debian-in/iok.git
 Vcs-Browser: http://git.debian.org/?p=debian-in/iok.git;a=summary
 Homepage: https://fedorahosted.org/iok/
diff --git a/debian/patches/add-missing-file-potfiles-in.diff b/debian/patches/add-missing-file-potfiles-in.diff
index 127f023..7b8c497 100644
--- a/debian/patches/add-missing-file-potfiles-in.diff
+++ b/debian/patches/add-missing-file-potfiles-in.diff
@@ -2,8 +2,8 @@ Description: Add missing file in POTFILES.in
 Author: Kartik Mistry <kartik at debian.org>
 Last-Update: <2010-12-02>
 
---- iok-1.3.11.orig/po/POTFILES.in
-+++ iok-1.3.11/po/POTFILES.in
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
 @@ -1,6 +1,7 @@
  # List of source files containing translatable strings.
  
diff --git a/debian/patches/manpage-fix.diff b/debian/patches/manpage-fix.diff
deleted file mode 100644
index 20e5588..0000000
--- a/debian/patches/manpage-fix.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fixed manpage warnings
-Author: Kartik Mistry <kartik at debian.org>
-Last-Update: <2010-12-03>
---- a/iok.1
-+++ b/iok.1
-@@ -21,9 +21,9 @@
- QWERTY keyboard from selected inscript keymap but also allows you to
- send those characters to currently active window. 
- .PP
--To see menus and combo box in iok UI, use "iok -a" command. 
--To start iok in any indic language use "iok -n <LANGCODE>" 
--e.g. for Hindi use "iok -n hi". 
-+To see menus and combo box in iok UI, use "iok \-a" command. 
-+To start iok in any indic language use "iok \-n <LANGCODE>" 
-+e.g. for Hindi use "iok \-n hi". 
- 
- This project is available at http://fedorahosted.org/iok/ or http://iok.sourceforge.net
- 
diff --git a/debian/patches/manpage-fixes.diff b/debian/patches/manpage-fixes.diff
new file mode 100644
index 0000000..8b1de04
--- /dev/null
+++ b/debian/patches/manpage-fixes.diff
@@ -0,0 +1,52 @@
+Description: Patch to fix manpage issues
+Author: Kartik Mistry <kartik at debian.org>
+Last-Update: 2012-05-03
+--- a/iok.1
++++ b/iok.1
+@@ -19,9 +19,9 @@
+ starts by loading Inscript2 keymap of the current locale. If keymap is not
+ installed or available then iok shows keymap list in the default mode. User can 
+ then select any keymap from keymap list if he want to write using it.
+-     In the advanced mode, iok allows to open non-supported keymaps. If keymap
++     In the advanced mode, iok allows one to open non-supported keymaps. If keymap
+ can be parsed by iok then it will be showed in iok UI otherwise it will show 
+-error message that iok can't load this keymap. Advanced mode also allows to
++error message that iok can't load this keymap. Advanced mode also allows one to
+ create custom keymap by either swapping or re-assigning character mappings in 
+ the existing loaded keymap in iok.
+      Another feature iok supports is Drag and Drop. This will allow user to swap
+@@ -34,17 +34,17 @@
+ iok
+ 
+ To start iok in advanced mode from console, use following command
+-iok -a
++iok \-a
+ 
+ To start iok in any supported Inscript2 keymap (say in Marathi) use following command
+-iok -n mr
++iok \-n mr
+ 
+ As Inscript2 keymap naming also uses language script code for some languages, command to open those keymaps is like this
+-iok -n pa-guru
++iok \-n pa-guru
+ where pa is a isocode name for the Punjabi language and guru is a language script code name in which keymap is written.
+ 
+ To use Drag and Drop feature of iok, start iok from console as
+-iok -d 1
++iok \-d 1
+ The Draft version of Inscript2 keymaps are available at https://fedorahosted.org/inscript2/
+ 
+ This project is available at http://fedorahosted.org/iok/ or http://iok.sourceforge.net
+@@ -65,10 +65,10 @@
+ In the place of LANGCODE,you need to specify a particular language code.
+ Shows iok UI for that particular language. This will also requires language 
+ script  code.
+-e.g. for Bodo, Dogri, Kokani, Nepali, Sindhi use its langcode and "-deva"
++e.g. for Bodo, Dogri, Kokani, Nepali, Sindhi use its langcode and "\-deva"
+ as a language script code.
+ 
+-To start iok using Kokani keymap, run "iok -n kok-deva"
++To start iok using Kokani keymap, run "iok \-n kok-deva"
+ .PP
+ .SH AUTHOR
+ Suji A <suji87.msc at gmail.com> , Parag <pnemade at fedoraproject.org>
diff --git a/debian/patches/series b/debian/patches/series
index a1f1be8..bed7176 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 add-missing-file-potfiles-in.diff
-manpage-fix.diff
+manpage-fixes.diff
diff --git a/debian/rules b/debian/rules
index cbe925d..1baefe0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,7 @@
 #!/usr/bin/make -f
 %:
 	dh $@
+
+override_dh_auto_install:
+	dh_auto_install
+	find $(CURDIR)/debian/iok -type d -empty -delete

-- 
iok.git



More information about the Debian-in-commits mailing list