Package: sary-ruby
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 e284dd04f585a6dbbb37ae22244da77a3703f039 Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 15 Apr 2012 19:26:54 +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/README.source | 5 ---
debian/changelog | 12 ++++++
debian/compat | 2 +-
debian/control | 16 +++++---
debian/copyright | 11 ++++--
debian/patches/00list | 1 -
.../10-fix-to-adapt-debian-ruby-policy.patch | 15 ++++++++
.../10_fix_to_adapt_debian_ruby_policy.dpatch | 37 -------------------
debian/patches/50-fix-multiarch-ftbfs.patch | 17 +++++++++
debian/patches/50_fix_multiarch_ftbfs.dpatch | 39 --------------------
debian/patches/series | 1 +
debian/rules | 27 +++++---------
debian/source/format | 1 +
13 files changed, 76 insertions(+), 108 deletions(-)
delete mode 100644 debian/README.source
delete mode 100644 debian/patches/00list
create mode 100644 debian/patches/10-fix-to-adapt-debian-ruby-policy.patch
delete mode 100644 debian/patches/10_fix_to_adapt_debian_ruby_policy.dpatch
create mode 100644 debian/patches/50-fix-multiarch-ftbfs.patch
delete mode 100644 debian/patches/50_fix_multiarch_ftbfs.dpatch
create mode 100644 debian/patches/series
create mode 100644 debian/source/format
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 dbde929..6f53db6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+sary-ruby (1.2.0-3.2) 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 to rules file.
+ * Fix copyright-without-copyright-notice (Lintian).
+ * Fix description-synopsis-starts-with-article (Lintian).
+ * Fix extended-description-is-probably-too-short (Lintian).
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 15 Apr 2012 19:25:30 +0300
+
sary-ruby (1.2.0-3.1) unstable; urgency=low
* Non-maintainer upload
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 f44fe8f..60152cb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,18 @@ Source: sary-ruby
Section: ruby
Priority: optional
Maintainer: Masahito Omote <om...@debian.org>
-Build-Depends: debhelper (>> 7), dpatch, ruby1.8, ruby1.8-dev, libsary-dev (>= 1:1.2.0), libglib2.0-dev
-Standards-Version: 3.8.3.0
+Build-Depends: debhelper (>= 9), ruby1.8, ruby1.8-dev, libsary-dev (>= 1:1.2.0), libglib2.0-dev
+Standards-Version: 3.9.3
Package: libsary-ruby1.8
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: A ruby binding of sary
- This package provides fast full-text search facilities using the data structure
- called suffix array through the libsary library.
+Description: ruby binding of sary
+ This package provides fast full-text search facilities using the data
+ structure called suffix array using the libsary library. -
+ .
+ libsary is a suffix array library and tools. It provides fast
+ full-text search facilities for text files on the order of 10 to 100
+ MB using a data structure called a suffix array. It can also search
+ specific fields in a text file by assigning index points to those
+ fields.
diff --git a/debian/copyright b/debian/copyright
index 98fce80..11560b6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,16 @@ Tue, 8 Apr 2003 23:02:33 +0900.
It was downloaded from http://ftp.namazu.org/sary/ruby/
-Upstream Authors: TAKAOKA Kazuma <kazum...@is.aist-nara.ac.jp>
- Hiroyuki Komatsu <koma...@taiyaki.org>
+Upstream Authors:
+
+ TAKAOKA Kazuma <kazum...@is.aist-nara.ac.jp>
+ Hiroyuki Komatsu <koma...@taiyaki.org>
Copyright:
+ Copyright (C) 2003 TAKAOKA Kazuma <kazum...@is.aist-nara.ac.jp>
+ 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.
@@ -23,4 +28,4 @@ Copyright:
USA.
On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+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 3318490..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-50_fix_multiarch_ftbfs.dpatch
diff --git a/debian/patches/10-fix-to-adapt-debian-ruby-policy.patch b/debian/patches/10-fix-to-adapt-debian-ruby-policy.patch
new file mode 100644
index 0000000..fdaf1fc
--- /dev/null
+++ b/debian/patches/10-fix-to-adapt-debian-ruby-policy.patch
@@ -0,0 +1,15 @@
+From: Hidetaka Iwai <ty...@debian.or.jp>
+Subject: No description.
+
+diff -urNad sary-ruby-1.2.0/extconf.rb /tmp/dpep.zAzFe0/sary-ruby-1.2.0/extconf.rb
+--- sary-ruby-1.2.0/extconf.rb 2005-04-16 22:04:43.000000000 +0900
++++ /tmp/dpep.zAzFe0/sary-ruby-1.2.0/extconf.rb 2005-04-16 22:13:37.000000000 +0900
+@@ -1,5 +1,8 @@
+ require 'mkmf'
+
++# mkmf.rb 1.8 workaround
++$extmk = 1
++
+ dir_config('sary')
+ # sary_config = with_config('sary-config', 'sary-config')
+
diff --git a/debian/patches/10_fix_to_adapt_debian_ruby_policy.dpatch b/debian/patches/10_fix_to_adapt_debian_ruby_policy.dpatch
deleted file mode 100644
index c5005fa..0000000
--- a/debian/patches/10_fix_to_adapt_debian_ruby_policy.dpatch
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 10_fix_to_adapt_debian_ruby_policy.dpatch by Hidetaka Iwai <ty...@debian.or.jp>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad sary-ruby-1.2.0/extconf.rb /tmp/dpep.zAzFe0/sary-ruby-1.2.0/extconf.rb
---- sary-ruby-1.2.0/extconf.rb 2005-04-16 22:04:43.000000000 +0900
-+++ /tmp/dpep.zAzFe0/sary-ruby-1.2.0/extconf.rb 2005-04-16 22:13:37.000000000 +0900
-@@ -1,5 +1,8 @@
- require 'mkmf'
-
-+# mkmf.rb 1.8 workaround
-+$extmk = 1
-+
- dir_config('sary')
- # sary_config = with_config('sary-config', 'sary-config')
-
diff --git a/debian/patches/50-fix-multiarch-ftbfs.patch b/debian/patches/50-fix-multiarch-ftbfs.patch
new file mode 100644
index 0000000..8479059
--- /dev/null
+++ b/debian/patches/50-fix-multiarch-ftbfs.patch
@@ -0,0 +1,17 @@
+From: Clint Byrum <cl...@ubuntu.com>
+Subject: Fails to build because it can't find glib-2.0
+
+=== modified file 'extconf.rb'
+--- a/extconf.rb 2004-01-08 20:13:07 +0000
++++ b/extconf.rb 2011-09-12 18:06:43 +0000
+@@ -15,7 +15,9 @@
+ ENV['PKG_CONFIG_PATH'] = '/usr/local/lib/pkgconfig/'
+ end
+
++$CFLAGS += ' ' + `#{pkg_config} glib-2.0 --cflags`.chomp
+ $CFLAGS += ' ' + `#{pkg_config} sary --cflags`.chomp
++$LDFLAGS += ' ' + `#{pkg_config} glib-2.0 --libs`.chomp
+ $LDFLAGS += ' ' + `#{pkg_config} sary --libs`.chomp
+
+ if have_header('sary.h') &&
+
diff --git a/debian/patches/50_fix_multiarch_ftbfs.dpatch b/debian/patches/50_fix_multiarch_ftbfs.dpatch
deleted file mode 100644
index e9cebcf..0000000
--- a/debian/patches/50_fix_multiarch_ftbfs.dpatch
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh -e
-## 50_fix_multiarch_ftbfs.dpatch.dpatch by Clint Byrum <cl...@ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fails to build because it can't find glib-2.0
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-=== modified file 'extconf.rb'
---- a/extconf.rb 2004-01-08 20:13:07 +0000
-+++ b/extconf.rb 2011-09-12 18:06:43 +0000
-@@ -15,7 +15,9 @@
- ENV['PKG_CONFIG_PATH'] = '/usr/local/lib/pkgconfig/'
- end
-
-+$CFLAGS += ' ' + `#{pkg_config} glib-2.0 --cflags`.chomp
- $CFLAGS += ' ' + `#{pkg_config} sary --cflags`.chomp
-+$LDFLAGS += ' ' + `#{pkg_config} glib-2.0 --libs`.chomp
- $LDFLAGS += ' ' + `#{pkg_config} sary --libs`.chomp
-
- if have_header('sary.h') &&
-
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2c397a5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+50-fix-multiarch-ftbfs.patch
diff --git a/debian/rules b/debian/rules
index b0f283f..f6faa3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -33,12 +30,18 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
+ cp -f /usr/share/misc/config.sub config.sub
+ cp -f /usr/share/misc/config.guess config.guess
#$(COMPILER_FLAGS) ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc
CFLAGS="$(CFLAGS)" ruby1.8 extconf.rb
+
+build-arch: build
+build-indep: build
+
build: build-stamp
-build-stamp: patch configure-stamp
+build-stamp: configure-stamp
@echo "--- Compiling"
dh_testdir
@@ -48,22 +51,12 @@ build-stamp: patch configure-stamp
touch build-stamp
-clean: clean1 unpatch
-
-clean1:
+clean:
@echo "--- Cleaning"
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
[ ! -f Makefile ] || $(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
-
+ rm -f build-stamp configure-stamp config.guess config.sub
dh_clean
install: build
@@ -112,4 +105,4 @@ binary-arch: build install
dh_builddeb
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
