Package: vflib3
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 fa5fb7c6b5dc7fdbe92e44246e4bf0c9512b890c Mon Sep 17 00:00:00 2001
From: Jari Aalto <jari.aa...@cante.net>
Date: Sun, 15 Apr 2012 23:58:56 +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 | 21 +++++++++++++
debian/compat | 2 +-
debian/control | 12 +++----
debian/copyright | 5 ++-
debian/patches/00list | 10 ------
debian/patches/01_build_fix_for_gcc_3.3.dpatch | 33 --------------------
debian/patches/02_GetNoFonts.dpatch | 33 --------------------
...lse.dpatch => 03-comparison-always-false.patch} | 11 +++----
...arent_dir.dpatch => 04-not-ln-parent-dir.patch} | 9 ++----
..._error.dpatch => 05-mkt1enc-syntax-error.patch} | 8 ++---
...=> 06-strdup-implicit-pointer-conversion.patch} | 11 ++-----
...etype2.dpatch => 07-build-with-freetype2.patch} | 8 ++---
debian/patches/08-fix-ftbfs-on-kfreebsd.patch | 14 +++++++++
debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch | 18 -----------
...patch => 09-avoid-segfault-at-vflmklib.c.patch} | 8 ++---
debian/patches/series | 10 ++++++
.../patches/unused/01-build-fix-for-gcc-3.3.patch | 14 +++++++++
debian/patches/unused/02-GetNoFonts.patch | 15 +++++++++
.../04-fix-configure-not-ln-pwd.patch} | 9 ++----
debian/rules | 30 +++++++++++-------
debian/source/format | 1 +
debian/vflib3-doc.doc-base | 2 +-
debian/watch | 7 ++---
23 files changed, 125 insertions(+), 166 deletions(-)
delete mode 100644 debian/patches/00list
delete mode 100644 debian/patches/01_build_fix_for_gcc_3.3.dpatch
delete mode 100644 debian/patches/02_GetNoFonts.dpatch
rename debian/patches/{03_comparison_always_false.dpatch => 03-comparison-always-false.patch} (68%)
rename debian/patches/{04_not_ln_parent_dir.dpatch => 04-not-ln-parent-dir.patch} (68%)
rename debian/patches/{05_mkt1enc_syntax_error.dpatch => 05-mkt1enc-syntax-error.patch} (66%)
rename debian/patches/{06_strdup_implicit_pointer_conversion.dpatch => 06-strdup-implicit-pointer-conversion.patch} (56%)
rename debian/patches/{07_build_with_freetype2.dpatch => 07-build-with-freetype2.patch} (99%)
create mode 100644 debian/patches/08-fix-ftbfs-on-kfreebsd.patch
delete mode 100644 debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch
rename debian/patches/{09_avoid_segfault_at_vflmklib.c.dpatch => 09-avoid-segfault-at-vflmklib.c.patch} (67%)
create mode 100644 debian/patches/series
create mode 100644 debian/patches/unused/01-build-fix-for-gcc-3.3.patch
create mode 100644 debian/patches/unused/02-GetNoFonts.patch
rename debian/patches/{04_fix_configure_not_ln_pwd.dpatch => unused/04-fix-configure-not-ln-pwd.patch} (62%)
create mode 100644 debian/source/format
diff --git a/debian/changelog b/debian/changelog
index 74ac6f2..b2d814b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+vflib3 (3.6.14.dfsg-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt".
+ - Move unused patches to debian/patches/unused for clearer view.
+ * Update to Standards-Version to 3.9.3, debhelper to 9, ${misc:Depends}.
+ * Add build-arch and build-indep targets; use dh_prep in rules file.
+ * Lintian fixes:
+ - copyright-refers-to-symlink-license.
+ - binary-control-field-duplicates-source setion.
+ - substvar-source-version-is-deprecated.
+ - debian-watch-contains-dh_make-template.
+ - copyright-without-copyright-notice.
+ - copyright-refers-to-symlink-license.
+ - non-empty-dependency_libs-in-la-file; do not install *.la.
+ - <http://wiki.debian.org/ReleaseGoals/LAFileRemoval>.
+ - doc-base-uses-applications-section.
+ - debian-watch-file-missing-version.
+
+ -- Jari Aalto <jari.aa...@cante.net> Sun, 15 Apr 2012 23:46:28 +0300
+
vflib3 (3.6.14.dfsg-3) unstable; urgency=low
* Remove RPATH from the generated library. (lintian)
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 952a50c..4a3c15b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: vflib3
Section: devel
Priority: optional
Maintainer: OHURA Makoto <oh...@debian.org>
-Build-Depends: autotools-dev, chrpath, debhelper (>> 5.0.0), dpatch, gettext, libfreetype6-dev, libkpathsea-dev, libt1-dev, libx11-dev, autoconf2.13, xutils-dev
-Standards-Version: 3.7.2
+Build-Depends: autotools-dev, chrpath, debhelper (>= 9), gettext, libfreetype6-dev, libkpathsea-dev, libt1-dev, libx11-dev, autoconf2.13, xutils-dev
+Standards-Version: 3.9.3
Package: vflib3-dev
Section: libdevel
Architecture: any
-Depends: vflib3 (= ${Source-Version}), libfreetype6-dev, libkpathsea-dev, libt1-dev, libc6-dev
+Depends: ${misc:Depends}, vflib3 (= ${binary:Version}), libfreetype6-dev, libkpathsea-dev, libt1-dev, libc6-dev
Description: Development files for VFlib3
VFlib3 is a font rasterizer library for multi-lingual information
processing. Using VFlib3, you can obtain bitmap data of characters(glyphs)
@@ -23,9 +23,8 @@ Description: Development files for VFlib3
with VFlib3.
Package: vflib3-bin
-Section: devel
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Sample programs using VFlib3
VFlib3 is a font rasterizer library for multi-lingual information
processing. Using VFlib3, you can obtain bitmap data of characters(glyphs)
@@ -41,6 +40,7 @@ Description: Sample programs using VFlib3
Package: vflib3-doc
Section: doc
Architecture: all
+Depends: ${misc:Depends}, install-info
Recommends: www-browser, postscript-viewer, info-browser
Suggests: vflib3
Description: Documentation for VFlib3
@@ -58,7 +58,7 @@ Description: Documentation for VFlib3
Package: vflib3
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Conflicts: watanabe-vfont (<< 1-6.6), asiya24-vfont (<< 1-6.6)
Suggests: watanabe-vfont (>> 1-6.6), asiya24-vfont (>> 1-6.6)
Description: Versatile Font Library
diff --git a/debian/copyright b/debian/copyright
index 107bb42..ee0d537 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,14 @@ Sun, 8 Jul 2001 16:10:42 +0900.
It was downloaded from
ftp://TypeHack.aial.hiroshima-u.ac.jp/pub/TypeHack/
+ 2012-04-15 the domain no longer exists.
Upstream Author: Hirotsugu Kakugawa <h.kakug...@computer.org>
Copyright:
+Copyright (C) 1996-2006 Hirotsugu Kakugawa <h.kakug...@computer.org>
+
* The VFlib library is distributed under the terms of GNU Library General
Public License.
@@ -16,4 +19,4 @@ Copyright:
License.
On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+License can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 06842b4..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,10 +0,0 @@
-#01_build_fix_for_gcc_3.3
-#02_GetNoFonts
-03_comparison_always_false
-#04_fix_configure_not_ln_pwd
-04_not_ln_parent_dir
-05_mkt1enc_syntax_error
-06_strdup_implicit_pointer_conversion
-07_build_with_freetype2
-08_fix_ftbfs_on_kfreebsd.dpatch
-09_avoid_segfault_at_vflmklib.c
diff --git a/debian/patches/01_build_fix_for_gcc_3.3.dpatch b/debian/patches/01_build_fix_for_gcc_3.3.dpatch
deleted file mode 100644
index 09a751e..0000000
--- a/debian/patches/01_build_fix_for_gcc_3.3.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-## 01_build_fix_for_gcc_3.3.dpatch by Masayuki Hatta <mha...@debian.org>
-##
-## All lines beginning with \`## DP:' are a description of the patch.
-## DP: Build fix for gcc-3.3.
-
-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
-
-
-diff -urN vflib3-3.6.13.orig/src/vfldisol.c vflib3-3.6.13/src/vfldisol.c
---- vflib3-3.6.13.orig/src/vfldisol.c 2004-02-09 13:46:49.000000000 +0900
-+++ vflib3-3.6.13/src/vfldisol.c 2004-02-09 13:47:11.000000000 +0900
-@@ -30,7 +30,6 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include <varargs.h>
- #include "VFlib-3_6.h"
-
- #define CommentLine printf
diff --git a/debian/patches/02_GetNoFonts.dpatch b/debian/patches/02_GetNoFonts.dpatch
deleted file mode 100644
index 65a7f46..0000000
--- a/debian/patches/02_GetNoFonts.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_GetNoFonts.dpatch by <vor...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build fix for libt1-dev
-
-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
-
-diff -urN vflib-3.6.13.orig/src/drv_t1.c vflib-3.6.13/src/drv_t1.c
---- vflib3-3.6.13.orig/src/drv_t1.c
-+++ vflib3-3.6.13/src/drv_t1.c
-@@ -934,7 +934,7 @@
- ps = 0.0 - ps;
-
- if ((last_dpix != dpix) || (last_dpiy != dpiy)){
-- for (i = 0; i < T1_Get_no_fonts(); i++)
-+ for (i = 0; i < T1_GetNoFonts(); i++)
- T1_DeleteAllSizes(i);
- if (T1_SetDeviceResolutions((float)dpix, (float)dpiy) < 0){
- last_dpix = LASTVAL_NONE;
diff --git a/debian/patches/03_comparison_always_false.dpatch b/debian/patches/03-comparison-always-false.patch
similarity index 68%
rename from debian/patches/03_comparison_always_false.dpatch
rename to debian/patches/03-comparison-always-false.patch
index 562f839..d6ccf8e 100644
--- a/debian/patches/03_comparison_always_false.dpatch
+++ b/debian/patches/03-comparison-always-false.patch
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_comparison_always_false.dpatch by Matej Vela <v...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix `comparison is always false' warnings on platforms where char
-## DP: is unsigned by default (this might lead to infinite loops).
+From: Matej Vela <v...@debian.org>
+Subject: Fix `comparison is always false' warnings.
+ Concerns platforms where char is unsigned by default (this might lead
+ to infinite loops).
-@DPATCH@
diff -urNad vflib3-3.6.13~/src/sexp.c vflib3-3.6.13/src/sexp.c
--- vflib3-3.6.13~/src/sexp.c
+++ vflib3-3.6.13/src/sexp.c
diff --git a/debian/patches/04_not_ln_parent_dir.dpatch b/debian/patches/04-not-ln-parent-dir.patch
similarity index 68%
rename from debian/patches/04_not_ln_parent_dir.dpatch
rename to debian/patches/04-not-ln-parent-dir.patch
index 572ef12..5827c9e 100644
--- a/debian/patches/04_not_ln_parent_dir.dpatch
+++ b/debian/patches/04-not-ln-parent-dir.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_not_ln_parent_dir.dpatch by OHURA Makoto <oh...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't make a symlink at parent directory.
-## DP: See Bug#381624
+From: OHURA Makoto <oh...@debian.org>
+Subject: Don't make a symlink at parent directory; see Bug#381624
-@DPATCH@
diff -urNad vflib3-3.6.14.dfsg~/aclocal.m4 vflib3-3.6.14.dfsg/aclocal.m4
--- vflib3-3.6.14.dfsg~/aclocal.m4 2008-02-05 20:38:37.000000000 +0900
+++ vflib3-3.6.14.dfsg/aclocal.m4 2008-02-12 23:48:44.000000000 +0900
diff --git a/debian/patches/05_mkt1enc_syntax_error.dpatch b/debian/patches/05-mkt1enc-syntax-error.patch
similarity index 66%
rename from debian/patches/05_mkt1enc_syntax_error.dpatch
rename to debian/patches/05-mkt1enc-syntax-error.patch
index 5a108db..8c64caf 100644
--- a/debian/patches/05_mkt1enc_syntax_error.dpatch
+++ b/debian/patches/05-mkt1enc-syntax-error.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_mkt1enc_syntax_error.dpatch by Matej Vela <v...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: t1lib/mkt1enc.sh: Fix unterminated quote.
+From: Matej Vela <v...@debian.org>
+Subject: t1lib/mkt1enc.sh: Fix unterminated quote.
-@DPATCH@
diff -urNad vflib3-3.6.13~/t1lib/mkt1enc.sh vflib3-3.6.13/t1lib/mkt1enc.sh
--- vflib3-3.6.13~/t1lib/mkt1enc.sh 2006-10-28 11:51:30.000000000 +0200
+++ vflib3-3.6.13/t1lib/mkt1enc.sh 2006-10-28 11:52:47.000000000 +0200
diff --git a/debian/patches/06_strdup_implicit_pointer_conversion.dpatch b/debian/patches/06-strdup-implicit-pointer-conversion.patch
similarity index 56%
rename from debian/patches/06_strdup_implicit_pointer_conversion.dpatch
rename to debian/patches/06-strdup-implicit-pointer-conversion.patch
index 9bfadc8..079581b 100644
--- a/debian/patches/06_strdup_implicit_pointer_conversion.dpatch
+++ b/debian/patches/06-strdup-implicit-pointer-conversion.patch
@@ -1,12 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_strdup_implicit_pointer_conversion.dpatch by OHURA Makoto <oh...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix Bug#464465
-## DP: Added -D_GNU_SOURCE to CFLAGS to enable prototype definition
-## DP: of strdup(3).
+From: OHURA Makoto <oh...@debian.org>
+Subject: Fix Bug#464465
+Added -D_GNU_SOURCE to CFLAGS to enable prototype definition of strdup(3).
-@DPATCH@
diff -urNad vflib3-3.6.14.dfsg~/configure.in vflib3-3.6.14.dfsg/configure.in
--- vflib3-3.6.14.dfsg~/configure.in 2008-02-09 00:02:49.000000000 +0900
+++ vflib3-3.6.14.dfsg/configure.in 2008-02-09 00:10:21.000000000 +0900
diff --git a/debian/patches/07_build_with_freetype2.dpatch b/debian/patches/07-build-with-freetype2.patch
similarity index 99%
rename from debian/patches/07_build_with_freetype2.dpatch
rename to debian/patches/07-build-with-freetype2.patch
index 95e919f..9a4e3e2 100644
--- a/debian/patches/07_build_with_freetype2.dpatch
+++ b/debian/patches/07-build-with-freetype2.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_build_with_freetype2.dpatch by OHURA Makoto <oh...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+From: OHURA Makoto <oh...@debian.org>
+Subject: No description.
-@DPATCH@
diff -urNad vflib3-3.6.14.dfsg~/configure.in vflib3-3.6.14.dfsg/configure.in
--- vflib3-3.6.14.dfsg~/configure.in 2008-06-07 15:15:49.000000000 +0900
+++ vflib3-3.6.14.dfsg/configure.in 2008-06-07 15:17:57.000000000 +0900
diff --git a/debian/patches/08-fix-ftbfs-on-kfreebsd.patch b/debian/patches/08-fix-ftbfs-on-kfreebsd.patch
new file mode 100644
index 0000000..ca26af2
--- /dev/null
+++ b/debian/patches/08-fix-ftbfs-on-kfreebsd.patch
@@ -0,0 +1,14 @@
+From: Cyril Brulebois <k...@debian.org>
+Subject: Fix FTBFS on GNU/kFreeBSD (Closes: #493125), thanks to Petr Salinger.
+
+--- vflib3-3.6.14.dfsg/ltconfig
++++ vflib3-3.6.14.dfsg/ltconfig
+@@ -1992,7 +1992,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-gnu*|kfreebsd*-gnu*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
diff --git a/debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch b/debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch
deleted file mode 100644
index e5a76ef..0000000
--- a/debian/patches/08_fix_ftbfs_on_kfreebsd.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_fix_ftbfs_on_kfreebsd.dpatch by Cyril Brulebois <k...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix FTBFS on GNU/kFreeBSD (Closes: #493125), thanks to Petr Salinger.
-
-@DPATCH@
---- vflib3-3.6.14.dfsg/ltconfig
-+++ vflib3-3.6.14.dfsg/ltconfig
-@@ -1992,7 +1992,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux-gnu*|kfreebsd*-gnu*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
diff --git a/debian/patches/09_avoid_segfault_at_vflmklib.c.dpatch b/debian/patches/09-avoid-segfault-at-vflmklib.c.patch
similarity index 67%
rename from debian/patches/09_avoid_segfault_at_vflmklib.c.dpatch
rename to debian/patches/09-avoid-segfault-at-vflmklib.c.patch
index 15ce797..6c9c08c 100644
--- a/debian/patches/09_avoid_segfault_at_vflmklib.c.dpatch
+++ b/debian/patches/09-avoid-segfault-at-vflmklib.c.patch
@@ -1,10 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_avoid_segfault_at_vflmklib.c.dpatch by OHURA Makoto <oh...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Avoid segfault at vflmk utilities.
+From: OHURA Makoto <oh...@debian.org>
+Subject: Avoid segfault at vflmk utilities.
-@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' vflib3-3.6.14.dfsg~/src/vflmklib.c vflib3-3.6.14.dfsg/src/vflmklib.c
--- vflib3-3.6.14.dfsg~/src/vflmklib.c 2008-06-07 18:13:19.000000000 +0900
+++ vflib3-3.6.14.dfsg/src/vflmklib.c 2010-04-10 21:03:05.000000000 +0900
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5445769
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,10 @@
+#01-build-fix-for-gcc-3.3.patch
+#02-GetNoFonts.patch
+03-comparison-always-false.patch
+#04-fix-configure-not-ln-pwd.patch
+04-not-ln-parent-dir.patch
+05-mkt1enc-syntax-error.patch
+06-strdup-implicit-pointer-conversion.patch
+07-build-with-freetype2.patch
+08-fix-ftbfs-on-kfreebsd.patch
+09-avoid-segfault-at-vflmklib.c.patch
diff --git a/debian/patches/unused/01-build-fix-for-gcc-3.3.patch b/debian/patches/unused/01-build-fix-for-gcc-3.3.patch
new file mode 100644
index 0000000..8105df2
--- /dev/null
+++ b/debian/patches/unused/01-build-fix-for-gcc-3.3.patch
@@ -0,0 +1,14 @@
+From: Masayuki Hatta <mha...@debian.org>
+Subject: Build fix for gcc-3.3.
+
+diff -urN vflib3-3.6.13.orig/src/vfldisol.c vflib3-3.6.13/src/vfldisol.c
+--- vflib3-3.6.13.orig/src/vfldisol.c 2004-02-09 13:46:49.000000000 +0900
++++ vflib3-3.6.13/src/vfldisol.c 2004-02-09 13:47:11.000000000 +0900
+@@ -30,7 +30,6 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <varargs.h>
+ #include "VFlib-3_6.h"
+
+ #define CommentLine printf
diff --git a/debian/patches/unused/02-GetNoFonts.patch b/debian/patches/unused/02-GetNoFonts.patch
new file mode 100644
index 0000000..4747c3b
--- /dev/null
+++ b/debian/patches/unused/02-GetNoFonts.patch
@@ -0,0 +1,15 @@
+From: <vor...@debian.org>
+Subject: Build fix for libt1-dev
+
+diff -urN vflib-3.6.13.orig/src/drv_t1.c vflib-3.6.13/src/drv_t1.c
+--- vflib3-3.6.13.orig/src/drv_t1.c
++++ vflib3-3.6.13/src/drv_t1.c
+@@ -934,7 +934,7 @@
+ ps = 0.0 - ps;
+
+ if ((last_dpix != dpix) || (last_dpiy != dpiy)){
+- for (i = 0; i < T1_Get_no_fonts(); i++)
++ for (i = 0; i < T1_GetNoFonts(); i++)
+ T1_DeleteAllSizes(i);
+ if (T1_SetDeviceResolutions((float)dpix, (float)dpiy) < 0){
+ last_dpix = LASTVAL_NONE;
diff --git a/debian/patches/04_fix_configure_not_ln_pwd.dpatch b/debian/patches/unused/04-fix-configure-not-ln-pwd.patch
similarity index 62%
rename from debian/patches/04_fix_configure_not_ln_pwd.dpatch
rename to debian/patches/unused/04-fix-configure-not-ln-pwd.patch
index 4827b24..d0a49de 100644
--- a/debian/patches/04_fix_configure_not_ln_pwd.dpatch
+++ b/debian/patches/unused/04-fix-configure-not-ln-pwd.patch
@@ -1,11 +1,6 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_fix_configure_not_ln_pwd.dpatch by Margarita Manterola
-## <ma...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the ln loop, so that it does not try to link the parent dir.
+From: Margarita Manterola
+Subject: Fix the ln loop, so that it does not try to link the parent dir.
-@DPATCH@
--- vflib3-3.6.13/configure 2006-08-13 12:21:31.000000000 -0300
+++ vflib3-marga/configure 2006-08-13 12:18:50.444197987 -0300
@@ -935,6 +935,9 @@
diff --git a/debian/rules b/debian/rules
index 2765928..a968f7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,12 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=4
-
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
+# modified by build process
+KEEP_FILES = \
+ configure \
+ src/vflmkcaptex \
+ config.sub \
+ config.guess
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
@@ -43,7 +44,8 @@ configure: configure-stamp
configure-stamp:
dh_testdir
# Add here commands to configure the package.
- ln -sf /usr/share/misc/config.sub /usr/share/misc/config.guess .
+ for f in $(KEEP_FILES); do [ -f $$f.orig ] || cp -a $$f $$f.orig ; done
+ cp /usr/share/misc/config.sub /usr/share/misc/config.guess .
autoconf2.13
CFLAGS="$(CFLAGS)" ./configure $(confflags) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
--enable-static \
@@ -55,30 +57,33 @@ configure-stamp:
touch configure-stamp
-build: patch configure-stamp build-stamp
+
+build-arch: build
+build-indep: build
+
+build: configure-stamp build-stamp
build-stamp:
dh_testdir
# Add here commands to compile the package.
$(MAKE)
-
+ for f in $(KEEP_FILES); do [ ! -f $$f.orig ] || mv $$f.orig $$f; done
touch build-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
# Add here commands to clean up after the build process.
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.sub config.guess
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
# Add here commands to install the package into debian/tmp
@@ -87,6 +92,9 @@ install: build
# Remove RPATH from the generated library. (lintian)
chrpath -d debian/tmp/usr/lib/libVFlib3.so.5.4.6
+ # Do not install *.la files (Policy)
+ rm -f debian/vflib3-dev/usr/lib/*.la
+
# Build architecture-independent files here.
binary-indep: build install
dh_testdir -i
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/debian/vflib3-doc.doc-base b/debian/vflib3-doc.doc-base
index 13ef540..35c2943 100644
--- a/debian/vflib3-doc.doc-base
+++ b/debian/vflib3-doc.doc-base
@@ -3,7 +3,7 @@ Title: VFlib3 Manual
Author: Hirotsugu Kakugawa
Abstract: This manual describes what vflib3 is
and how it can be used
-Section: Apps/Programming
+Section: Programming
Format: postscript
Files: /usr/share/doc/vflib3-doc/VFlib-36.ps.gz
diff --git a/debian/watch b/debian/watch
index ea9f693..20cdf43 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site Directory Pattern Version Script
-TypeHack.aial.hiroshima-u.ac.jp /pub/TypeHack/ VFlib3-(.*)\.tar\.gz debian uupdate
+version=3
+ftp://TypeHack.aial.hiroshima-u.ac.jp/pub/TypeHack/ VFlib3-(.*)\.tar\.gz
--
1.7.9.5
