Package: gkermit
Severity: wishlist
Tags: patch
Hi,
The dpatch patch management system has been deprecated for some time. The
Lintian currently flags use of dpatch packages as an error. The new 3.0
packaging format is an improved version which, among other things, contains
patch management built-in. For more information, see:
http://wiki.debian.org/Projects/DebSrc3.0
I had some free time; see attached patch to migrate to new package
format. Note that all files in debian/patches/* are canocalized to
*.patch.
Notes:
The original soures were restored and local changes moved to
patch 00:
gcmdline.c
gkermit.c
gkermit.nr
gunixio.c
gwart.c
makefile
Let me know if there is anything that needs adjusting or if it is ok
to upload this version in a NMU in case you are working on other
issues needing attention.
Thanks,
Jari
>From f486fc165e6654d97028db643e43c870076b0d01 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Fri, 20 Apr 2012 22:08:06 +0300
Subject: [PATCH] format-3.0
Organization: Private
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Signed-off-by: Jari Aalto <jari.aa...@cante.net>
---
debian/changelog | 13 ++++++++++++
debian/compat | 2 +-
debian/control | 9 ++++----
debian/copyright | 7 ++++++-
debian/patches/00list | 2 --
...ndicator.dpatch => 01-progress-indicator.patch} | 22 ++------------------
...g_mode.dpatch => 02-stdout-blocking-mode.patch} | 22 ++------------------
debian/patches/series | 3 +++
debian/rules | 11 ++++++----
debian/source/format | 1 +
gcmdline.c | 4 +---
gkermit.c | 3 ---
gkermit.nr | 2 +-
gunixio.c | 2 --
gwart.c | 1 -
makefile | 19 +++++++----------
16 files changed, 49 insertions(+), 74 deletions(-)
delete mode 100644 debian/patches/00list
rename debian/patches/{01_progress_indicator.dpatch => 01-progress-indicator.patch} (72%)
rename debian/patches/{02_stdout_blocking_mode.dpatch => 02-stdout-blocking-mode.patch} (68%)
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index e1e29a0..8bd4f45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gkermit (1.0-9.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ * Update to Standards-Version to 3.9.3 and debhelper to 9.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Patch 00 is new; in-line changes to original sources.
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix copyright-refers-to-symlink-license (Lintian).
+ * Fix no-homepage-field (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Fri, 20 Apr 2012 22:04:54 +0300
+
gkermit (1.0-9) unstable; urgency=low
* Bumped to Standards-Version: 3.8.0.
diff --git a/debian/compat b/debian/compat
index b8626c4..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+9
diff --git a/debian/control b/debian/control
index a415f58..37d0603 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,14 @@ Source: gkermit
Section: comm
Priority: optional
Maintainer: Masayuki Hatta (mhatta) <mha...@debian.org>
-Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 4.0.2), dpatch
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9)
+Homepage: http://www.kermitproject.org
Package: gkermit
Architecture: any
-Depends: ${shlibs:Depends}
-Description: A serial and network communications package
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: serial and network communications package
G-Kermit is a GPL'd kermit package. It offers medium-independent terminal
session and file transfer. The non-free package ckermit adds connection
establishment, character-set translation and scripting features.
diff --git a/debian/copyright b/debian/copyright
index e7f9c0b..cd6f6a9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,11 @@ This package was debianized by Vaidhyanathan G Mayilrangam <vai...@debian.org>
on Tue, 4 Jan 2000 14:13:19 -0500.
It was downloaded from http://www.columbia.edu/kermit/gkermit.html
+In 2012-04-20 the "current" menu reads at page: "The Kermit Project at
+Columbia University is cancelled effective 1 July 2011 (...) A new
+Kermit Project website has been established outside of Columbia at
+www.kermitproject.org for the continued development of C-Kermit,
+E-Kermit, and Kermit 95."
Upstream Authors: The Kermit Project <ker...@columbia.edu>
@@ -25,4 +30,4 @@ Copyright:
51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in /usr/share/common-licenses/GPL'.
+Public License can be found in /usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 069dd93..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_progress_indicator
-02_stdout_blocking_mode
diff --git a/debian/patches/01_progress_indicator.dpatch b/debian/patches/01-progress-indicator.patch
similarity index 72%
rename from debian/patches/01_progress_indicator.dpatch
rename to debian/patches/01-progress-indicator.patch
index 7978e4f..03a5ed8 100644
--- a/debian/patches/01_progress_indicator.dpatch
+++ b/debian/patches/01-progress-indicator.patch
@@ -1,23 +1,5 @@
-#! /bin/sh -e
-## 01_progress_indicator.dpatch by Masayuki Hatta <mha...@debian.org>
-##
-## All lines beginning with \`## DP:' are a description of the patch.
-## DP: Adds progress indicator
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0
-;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
+From: Masayuki Hatta <mha...@debian.org>
+Subject: Adds progress indicator
diff -Nur gkermit-1.0/gcmdline.c gkermit-1.0.progress/gcmdline.c
--- gkermit-1.0/gcmdline.c 2004-08-19 16:10:23.000000000 -0500
diff --git a/debian/patches/02_stdout_blocking_mode.dpatch b/debian/patches/02-stdout-blocking-mode.patch
similarity index 68%
rename from debian/patches/02_stdout_blocking_mode.dpatch
rename to debian/patches/02-stdout-blocking-mode.patch
index 6593ea8..c8590c6 100644
--- a/debian/patches/02_stdout_blocking_mode.dpatch
+++ b/debian/patches/02-stdout-blocking-mode.patch
@@ -1,23 +1,5 @@
-#! /bin/sh -e
-## 02_stdout_blocking_mode.dpatch by Steve Fosdick <db...@pelvoux.nildram.co.uk>
-##
-## All lines beginning with \`## DP:' are a description of the patch.
-## DP: Fixes 100% CPU usage problem during send
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -f --no-backup-if-mismatch --dry-run -p1 < $0 && patch -f --no-backup-if-mismatch -p1 < $0
-;;
- -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
+From: Steve Fosdick <db...@pelvoux.nildram.co.uk>
+Subject: Fixes 100% CPU usage problem during send
diff -urN gkermit-1.0.orig/gunixio.c gkermit-1.0/gunixio.c
--- gkermit-1.0.orig/gunixio.c 2007-05-01 11:51:59.000000000 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..aeb1ebb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+00-debian-local-changes.patch
+01-progress-indicator.patch
+02-stdout-blocking-mode.patch
diff --git a/debian/rules b/debian/rules
index ef517c7..6dc2ae7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,12 @@
#export DH_VERBOSE=1
# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-build: patch build-stamp
+
+build-arch: build
+build-indep: build
+
+build: build-stamp
build-stamp:
dh_testdir
@@ -17,7 +20,7 @@ build-stamp:
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp
@@ -31,7 +34,7 @@ clean: unpatch
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/<packagename>
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)
diff --git a/gcmdline.c b/gcmdline.c
index 6c171da..61cbf11 100644
--- a/gcmdline.c
+++ b/gcmdline.c
@@ -29,8 +29,6 @@
*/
#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include "gkermit.h"
/* Externals */
@@ -55,7 +53,7 @@ _MYPROTOTYPE( VOID fatal, (char *) );
_MYPROTOTYPE( VOID usage, (void) );
#ifndef NOGETENV
-/* _MYPROTOTYPE( char * getenv, (char *) ); */
+_MYPROTOTYPE( char * getenv, (char *) );
#define GARGC 32
#define GBUFSIZ 256
static char gbuf[GBUFSIZ], *gargs[GARGC], *gptr = NULL;
diff --git a/gkermit.c b/gkermit.c
index f8493e9..3c66973 100644
--- a/gkermit.c
+++ b/gkermit.c
@@ -56,9 +56,6 @@ char *build = "stty";
#define _GKERMIT_C
#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
#include "gkermit.h"
/* Forward declarations of functions used within this module... */
diff --git a/gkermit.nr b/gkermit.nr
index 7213ea2..b3c573c 100644
--- a/gkermit.nr
+++ b/gkermit.nr
@@ -1,5 +1,5 @@
.\" @(#) gkermit.1 1.00 Columbia University 1999/12/25
-.TH GKERMIT 1 "25 Dec 1999" "UNIX G-Kermit"
+.TH GKERMIT 1C "25 Dec 1999" "UNIX G-Kermit"
.SH NAME
gkermit \- G-Kermit (GNU Kermit) 1.00 file transfer software.
.ll 80
diff --git a/gunixio.c b/gunixio.c
index d91b0df..a271b88 100644
--- a/gunixio.c
+++ b/gunixio.c
@@ -75,8 +75,6 @@
#include <setjmp.h> /* Longjumps */
#include <sys/stat.h> /* File exist, file size */
#include <errno.h> /* Error symbols */
-#include <unistd.h>
-#include <string.h>
#include "gkermit.h" /* gkermit definitions */
/* All versions of HP-UX need Xon/Xoff */
diff --git a/gwart.c b/gwart.c
index 41ddfba..81eb1f8 100644
--- a/gwart.c
+++ b/gwart.c
@@ -40,7 +40,6 @@
#include <stdio.h>
#include <ctype.h>
-#include <stdlib.h>
#include "gkermit.h"
#define TBL_TYPE "short" /* C data type of state table */
diff --git a/makefile b/makefile
index 3d7e900..95ee24f 100644
--- a/makefile
+++ b/makefile
@@ -28,22 +28,17 @@
# See README and COPYING for further information.
# Sample installation values - change or override as needed.
-prefix = /usr/local
-BINDIR = ${prefix}/bin
-MANDIR = ${prefix}/share/man/man1
-TEXTDIR = ${prefix}/share/doc/gkermit
-INFODIR = ${prefix}/share/info
-MANEXT = 1
+BINDIR = /usr/local/bin
+MANDIR = /usr/man/manl
+TEXTDIR = /usr/local/doc
+INFODIR = /usr/local/info
+MANEXT = l
# Default compiler and flags
CC=cc
-CFLAGS= -Wall -DPOSIX -O $(KFLAGS)
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
+CFLAGS= -DPOSIX -O $(KFLAGS)
# Object files
@@ -99,7 +94,7 @@ bsd211: gwart
cc -o gkermit $(OBJECTS)
clean:
- rm -f $(OBJECTS) gproto.o gwart.o gwart gkermit
+ rm -f $(OBJECTS) gproto.o gproto.c gwart.o gwart
install:
@if test -f ./gkermit; then \
--
1.7.9.5
