From 5f0d080062f7ec46a8981cec31b07e6ca02bf564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:19:26 -0400 Subject: [PATCH 01/22] add changelog for 0.2.1 release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 973f99b..99cb432 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-percol (0.2.1-1) unstable; urgency=medium + + * New upstream version + + -- Antoine Beaupré Thu, 20 Jul 2017 16:19:12 -0400 + python-percol (0.1-1) unstable; urgency=low * Initial public release From 01114363a09959636111a0da0e3fe2f09df0d59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:21:17 -0400 Subject: [PATCH 02/22] close the ITP in the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 99cb432..05d7050 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ python-percol (0.2.1-1) unstable; urgency=medium - * New upstream version + * New upstream version (Closes: #754972) -- Antoine Beaupré Thu, 20 Jul 2017 16:19:12 -0400 From 3103afe285b5be453f517623bd8941218fa355a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:23:08 -0400 Subject: [PATCH 03/22] add missing build-deps and python shims to control file --- debian/control | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ac7c38a..931379c 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,16 @@ Source: python-percol Section: python Priority: extra Maintainer: Kozo Nishida -Build-Depends: debhelper (>= 9), python +Build-Depends: debhelper (>= 9) + , python + , python-setuptools +XS-Python-Version: >= 2.7 Standards-Version: 3.9.5 Package: python-percol Architecture: all +Depends: ${misc:Depends} + , ${python:Depends} Description: percol adds flavor of interactive selection to the traditional pipe concept on UNIX. percol is an interactive grep tool in your terminal. percol 1. receives input lines from stdin or a file, From 7a59ba53c0685154f7806458480a582597d0fedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:23:38 -0400 Subject: [PATCH 04/22] switch section and priority --- debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 931379c..731c778 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: python-percol -Section: python -Priority: extra +Section: utils +Priority: optional Maintainer: Kozo Nishida Build-Depends: debhelper (>= 9) , python From 81828c2be951c80d82e2dd36a3e3f1a5d6d93d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:25:55 -0400 Subject: [PATCH 05/22] add missing dh-python dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 731c778..6ae6288 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Kozo Nishida Build-Depends: debhelper (>= 9) , python , python-setuptools + , dh-python XS-Python-Version: >= 2.7 Standards-Version: 3.9.5 From 23969d322ba9e89387becc1b524332f64653e7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:26:03 -0400 Subject: [PATCH 06/22] update standards --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 6ae6288..c98b0b7 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9) , python-setuptools , dh-python XS-Python-Version: >= 2.7 -Standards-Version: 3.9.5 +Standards-Version: 3.9.8 Package: python-percol Architecture: all From f0e9caf5bae0fb5cb7a04bc706afcdc52386a78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:26:13 -0400 Subject: [PATCH 07/22] this is not a library but a binary package --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index c98b0b7..026da8a 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9) XS-Python-Version: >= 2.7 Standards-Version: 3.9.8 -Package: python-percol +Package: percol Architecture: all Depends: ${misc:Depends} , ${python:Depends} From 4adc2c501b97a08b05c874e5c8df02f4af845936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:26:24 -0400 Subject: [PATCH 08/22] fix lintian warnings in description --- debian/control | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 026da8a..69667db 100644 --- a/debian/control +++ b/debian/control @@ -13,10 +13,14 @@ Package: percol Architecture: all Depends: ${misc:Depends} , ${python:Depends} -Description: percol adds flavor of interactive selection to the traditional pipe concept on UNIX. - percol is an interactive grep tool in your terminal. percol +Description: percol adds interactive selection to UNIX pipes + percol is an interactive grep tool in your terminal. percol: + . 1. receives input lines from stdin or a file, 2. lists up the input lines, 3. waits for your input that filter/select the line(s), 4. and finally outputs the selected line(s) to stdout. - Since percol just filters the input and output the result to stdout, it can be used in command-chains with | in your shell (UNIX philosophy!). + . + Since percol just filters the input and output the result to stdout, + it can be used in command-chains with | in your shell (UNIX + philosophy!). From 4c0a9378ae041cc6804831b3481ee3b05e43bae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:29:34 -0400 Subject: [PATCH 09/22] remove python- prefix from source package as well --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 69667db..df3031e 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: python-percol +Source: percol Section: utils Priority: optional Maintainer: Kozo Nishida From 9344b32ab4b6367a8af760ef0f74483f473ab016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:29:43 -0400 Subject: [PATCH 10/22] one more lintian warning fix --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index df3031e..4871cac 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Architecture: all Depends: ${misc:Depends} , ${python:Depends} Description: percol adds interactive selection to UNIX pipes - percol is an interactive grep tool in your terminal. percol: + An interactive grep tool in your terminal. Percol does the following: . 1. receives input lines from stdin or a file, 2. lists up the input lines, From 890561a22f0b723e2505db3a9dd4489533e6717b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:29:51 -0400 Subject: [PATCH 11/22] add missing dependency --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 4871cac..7abf81e 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Package: percol Architecture: all Depends: ${misc:Depends} , ${python:Depends} +Recommends: cmigego Description: percol adds interactive selection to UNIX pipes An interactive grep tool in your terminal. Percol does the following: . From 8ab76a84b5928f9457351d26013269d89a80b292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:31:58 -0400 Subject: [PATCH 12/22] cleanup changelog --- debian/changelog | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 05d7050..686b90e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ -python-percol (0.2.1-1) unstable; urgency=medium - - * New upstream version (Closes: #754972) - - -- Antoine Beaupré Thu, 20 Jul 2017 16:19:12 -0400 - -python-percol (0.1-1) unstable; urgency=low +percol (0.2.1-1) unstable; urgency=medium + [ Kozo Nishida ] * Initial public release - -- Kozo Nishida Sun, 23 Aug 2014 4:15:00 +0200 + [ Antoine Beaupré ] + * New upstream version (Closes: #754972) + * Fix lintian warnings + * Add missing dh-python dependency + * Update standards, no change + * Remove python- prefix from package + * Switch section and priority + + -- Antoine Beaupré Thu, 20 Jul 2017 16:30:44 -0400 From ba6e6c4840b63a040184488ae1a0cfd1db17288c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:33:11 -0400 Subject: [PATCH 13/22] fix lintian warning again --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 7abf81e..c4a4004 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Architecture: all Depends: ${misc:Depends} , ${python:Depends} Recommends: cmigego -Description: percol adds interactive selection to UNIX pipes +Description: interactive selection for UNIX pipes An interactive grep tool in your terminal. Percol does the following: . 1. receives input lines from stdin or a file, From 5e41800ba55f90eddf1d2faf5dbbb436707532fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:51:10 -0400 Subject: [PATCH 14/22] add debian copyright file --- debian/copyright | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 debian/copyright diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..c45f2e1 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,9 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ + +Files: * +Copyright: 2011-2013, mooz +License: GPL-2+ + +Files: debian/* +Copyright: 2017, Antoine Beaupré, Kozo Nishida +License: GPL-2+ From 3d1050fa2ff8ffe56e19a706789dbb3e73d0d758 Mon Sep 17 00:00:00 2001 From: Antti Kervinen Date: Tue, 30 Jun 2015 15:37:23 +0300 Subject: [PATCH 15/22] Fix debian packaging spaces replaced by a tab in debian/rules to make make happy. --- debian/rules | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) mode change 100644 => 100755 debian/rules diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index ed3f710..4647c9c --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,4 @@ #!/usr/bin/make -f %: - dh $@ --with python2 - + dh $@ --with python2 From 7e205ba17031386380f9370803d96ef09b83b894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:55:54 -0400 Subject: [PATCH 16/22] add missing license text --- debian/copyright | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/copyright b/debian/copyright index c45f2e1..53f8898 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,3 +7,18 @@ License: GPL-2+ Files: debian/* Copyright: 2017, Antoine Beaupré, Kozo Nishida 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 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 program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. From 1318baa0cefbf3828f6e66cd2517bcc25a336a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:56:11 -0400 Subject: [PATCH 17/22] add myself as uploader --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index c4a4004..04474f7 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: percol Section: utils Priority: optional Maintainer: Kozo Nishida +Uploaders: Antoine Beaupré Build-Depends: debhelper (>= 9) , python , python-setuptools From 4a2153e4bffdb94c95ac689c3a890cc83aaa5055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 16:59:00 -0400 Subject: [PATCH 18/22] fix another lintian warning --- debian/copyright | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/copyright b/debian/copyright index 53f8898..6cff6f8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -22,3 +22,6 @@ License: GPL-2+ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-2". From c4b4ebc0c8787d465b93f0aebcdbf0a36f7288a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 17:00:44 -0400 Subject: [PATCH 19/22] switch back to 0.1.0, add source format --- debian/changelog | 2 +- debian/source/format | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 debian/source/format diff --git a/debian/changelog b/debian/changelog index 686b90e..f00f424 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -percol (0.2.1-1) unstable; urgency=medium +percol (0.1.0-1) unstable; urgency=medium [ Kozo Nishida ] * Initial public release diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) From 54c6bd1319cbcba7aa8144933128d17def9e9365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 17:02:45 -0400 Subject: [PATCH 20/22] ship README file --- debian/docs | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/docs diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README From 2c5c99cc2b47853cb216b6a6a5f00b31a60ff54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 17:06:35 -0400 Subject: [PATCH 21/22] upstream seems to have switched to MIT --- debian/copyright | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/debian/copyright b/debian/copyright index 6cff6f8..2a602b7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,26 +2,28 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Files: * Copyright: 2011-2013, mooz -License: GPL-2+ +License: MIT Files: debian/* -Copyright: 2017, Antoine Beaupré, Kozo Nishida -License: GPL-2+ +Copyright: 2017, Antoine Beaupré +License: MIT -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. +License: MIT + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: . - 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. + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-2". + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 8f854506b01bd4e3626f52363fcd2ebabf7dd044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Thu, 20 Jul 2017 17:06:42 -0400 Subject: [PATCH 22/22] prepare 0.2.1 release --- debian/changelog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f00f424..ecd135a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ +percol (0.2.1-1) unstable; urgency=medium + + * New upstream version (Closes: #754972) + + -- Antoine Beaupré Thu, 20 Jul 2017 17:06:10 -0400 + percol (0.1.0-1) unstable; urgency=medium [ Kozo Nishida ] * Initial public release [ Antoine Beaupré ] - * New upstream version (Closes: #754972) * Fix lintian warnings * Add missing dh-python dependency * Update standards, no change