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

Thu May 3 11:23:30 UTC 2012

The following commit has been merged in the master branch:
commit 36b5aec5a167e96a5230bdbbcae5308d42e92cd5
Author: Kartik Mistry <kartik at debian.org>
Date:   Thu May 3 16:53:13 2012 +0530

    Updated copyright to copyright format 1.0

diff --git a/debian/changelog b/debian/changelog
index 46b2a53..af8615d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-iok (2.1.2-1) UNRELEASED; urgency=low
+iok (2.1.2-1) unstable; urgency=low
 
   * New Upstream release.
   * debian/control:
@@ -6,9 +6,11 @@ iok (2.1.2-1) UNRELEASED; urgency=low
     + Updated Build-Dep for GTK-3 interface.
   * debian/rules:
     + Removed empty directories.
-  * Updated patch: manpage-fixes.diff
+  * Refreshed patch: manpage-fixes.diff
+  * debian/copyright:
+    + Updated to copyright format 1.0
 
- -- Kartik Mistry <kartik at debian.org>  Thu, 03 May 2012 12:08:12 +0530
+ -- Kartik Mistry <kartik at debian.org>  Thu, 03 May 2012 16:52:12 +0530
 
 iok (1.3.13-1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 7997a44..7a2fd62 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,126 +1,39 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: IOK
 Upstream-Contact: Parag Nemade <panemade at gmail.com>
 Source: https://fedorahosted.org/iok/
 
 Files: *
-Copyright: 2008-2010, Parag Nemade <panemade at gmail.com>
+Copyright: 2008-2012, Parag Nemade <pnemade AT redhat DOT com>
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
 
 Files: debian/*
 Copyright: 2009, Suji A <suji87.msc at gmail.com>,
-           2011, Kartik Mistry <kartik at debian.org>
+           2011-2012, Kartik Mistry <kartik at debian.org>
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
 
-Files: src/keyevent.c
-Copyright: 2007, Michael Levin <risujin at risujin.org>
+Files: src/keyevent.c src/keys.h
+Copyright: 2007, Michael Levin <risujin at risujin.org>,
+           2011-2012, Parag Nemade <pnemade AT redhat DOT com>
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
 
 Files: po/ca.po
 Copyright: 2009, Free Software Foundation
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
 
 Files: po/de.po po/de_CH.po po/zh_CN.po
 Copyright: 2008 iok
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
 
 Files: po/it.po
 Copyright: 2009, Red Hat, Inc.
 License: GPL-2+
- This program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; either version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along with
- this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public License version 2
- can be found in the file `/usr/share/common-licenses/GPL-2'.
 
 Files: po/ja.po
 Copyright: 2009, iok
 License: GPL-2+
+
+License: GPL-2+
  This program is free software; you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
  Foundation; either version 2 of the License, or (at your option) any later

-- 
iok.git

