Package: prime-dict
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.
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 a729fbdd1d805a5a55f46a42f07b6a87c50adff9 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 15 Apr 2012 00:31:01 +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/Makefile | 240 --------------------------------------------------
debian/README.source | 5 --
debian/changelog | 11 +++
debian/compat | 2 +-
debian/control | 5 +-
debian/copyright | 7 +-
debian/rules | 20 +++--
debian/source/format | 1 +
8 files changed, 31 insertions(+), 260 deletions(-)
delete mode 100644 debian/Makefile
delete mode 100644 debian/README.source
create mode 100644 debian/source/format
diff --git a/debian/Makefile b/debian/Makefile
deleted file mode 100644
index 25d7fb6..0000000
--- a/debian/Makefile
+++ /dev/null
@@ -1,240 +0,0 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
-# debian/Makefile. Generated from Makefile.in by configure.
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# Makefile.am: Template of Automake for prime/debian.
-# $Id: Makefile.am,v 1.1.2.2 2004/01/15 18:21:59 komatsu Exp $
-#
-# Copyright (C) 2003 Hiroyuki Komatsu <koma...@taiyaki.org>
-# All rights reserved.
-# This is free software with ABSOLUTELY NO WARRANTY.
-#
-# You can redistribute it and/or modify it under the terms of
-# the GNU General Public License version 2.
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/prime-dict
-pkglibdir = $(libdir)/prime-dict
-pkgincludedir = $(includedir)/prime-dict
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /usr/bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-ACLOCAL = ${SHELL} /home/tyuyu/debworks/prime-dict/prime-dict-0.6.7/missing --run aclocal-1.7
-AMTAR = ${SHELL} /home/tyuyu/debworks/prime-dict/prime-dict-0.6.7/missing --run tar
-AUTOCONF = ${SHELL} /home/tyuyu/debworks/prime-dict/prime-dict-0.6.7/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/tyuyu/debworks/prime-dict/prime-dict-0.6.7/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/tyuyu/debworks/prime-dict/prime-dict-0.6.7/missing --run automake-1.7
-AWK = gawk
-CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"prime-dict\" -DPACKAGE_TARNAME=\"Dictionaries\ of\ PRIME\" -DPACKAGE_VERSION=\"0.6.7\" -DPACKAGE_STRING=\"prime-dict\ 0.6.7\" -DPACKAGE_BUGREPORT=\"koma...@taiyaki.org\" -DPACKAGE=\"prime-dict\" -DVERSION=\"0.6.7\"
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LIBOBJS =
-LIBS =
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/tyuyu/debworks/prime-dict/prime-dict-0.6.7/missing --run makeinfo
-PACKAGE = prime-dict
-PACKAGE_BUGREPORT = koma...@taiyaki.org
-PACKAGE_NAME = prime-dict
-PACKAGE_STRING = prime-dict 0.6.7
-PACKAGE_TARNAME = Dictionaries of PRIME
-PACKAGE_VERSION = 0.6.7
-PATH_SEPARATOR = :
-PRIME_DICT_DIR = /usr/share/prime/dict
-SET_MAKE =
-SHELL = /bin/bash
-STRIP =
-VERSION = 0.6.7
-ac_ct_STRIP =
-am__leading_dot = .
-bindir = ${exec_prefix}/bin
-build_alias = i386-linux
-datadir = ${prefix}/share
-exec_prefix = /usr
-host_alias = i386-linux
-includedir = ${prefix}/include
-infodir = ${prefix}/share/info
-install_sh = /home/tyuyu/debworks/prime-dict/prime-dict-0.6.7/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/share/man
-oldincludedir = /usr/include
-prefix = /usr
-program_transform_name = s,x,x,
-rubydir = ${prefix}/lib/ruby/1.8
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = /etc
-target_alias =
-
-EXTRA_DIST = changelog control copyright compat rules
-subdir = debian
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --gnu debian/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
- if test -d $$d/$$file; then \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- else \
- test -f $(distdir)/$$file \
- || cp -p $$d/$$file $(distdir)/$$file \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
- -rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am info info-am install \
- install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am install-man \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index a04f8e9..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses dpatch for managing all modifications to the upstream source
-code. See /usr/share/doc/dpatch/README.source.gz for more details on how to
-use them.
-
--- Masahito Omote <om...@debian.org>, Sat, 23 Jan 2010 13:10:00 +0900
diff --git a/debian/changelog b/debian/changelog
index 00d48e5..ce1f68a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+prime-dict (1.0.0-2.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 required build-arch and build-indep targets.
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix copyright-refers-to-symlink-license (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sat, 14 Apr 2012 23:50:49 +0300
+
prime-dict (1.0.0-2) unstable; urgency=low
* New maintainer. Taking over by sponsor, because I cannot contact to
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 2b7243a..4c676a6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: prime-dict
Section: text
Priority: optional
Maintainer: Masahito Omote <om...@debian.org>
-Build-Depends: debhelper (>> 7), dpatch
-Standards-Version: 3.8.3.0
+Build-Depends: debhelper (>= 9)
+Standards-Version: 3.9.3
+Homepage: http://sourceforge.jp/projects/prime
Package: prime-dict
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 33e85b8..09384a7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,8 @@ Upstream Author: Hiroyuki Komatsu <koma...@taiyaki.org>
Copyright:
+ Copyright (C) 2003 Hiroyuki Komatsu <koma...@taiyaki.org>
+
This package 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; version 2 dated June, 1991.
@@ -16,10 +18,5 @@ Copyright:
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 complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/rules b/debian/rules
index ccabc6f..3385a80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,19 @@
#export DH_VERBOSE=1
# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
dh_testdir
./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --with-rubydir=\$${prefix}/lib/ruby/1.8
touch configure-stamp
+
+build-arch: build
+build-indep: build
+
build: configure-stamp build-stamp
build-stamp:
dh_testdir
@@ -26,17 +29,20 @@ build-stamp:
touch build-stamp
-clean: clean1 unpatch
-
-clean1:
+clean:
@echo "--- Cleaning"
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+
[ ! -f Makefile ] || $(MAKE) clean
- dh_clean
+ rm -f configure.lineno config.log config.status \
+ lib/prime-dict-config.rb
+
+ find . -name Makefile | xargs -r rm
+ dh_clean
install: build
@@ -86,4 +92,4 @@ binary-arch: build install
# Nothing to do...
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean1
+.PHONY: build clean binary-indep binary-arch binary install clean1
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)
--
1.7.9.5
