tags 649829 + pending
thanks
Dear maintainer,
I've prepared an NMU for sjfonts (versioned as 2.0.2-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru sjfonts-2.0.2/debian/changelog sjfonts-2.0.2/debian/changelog
--- sjfonts-2.0.2/debian/changelog 2011-12-10 19:46:59.000000000 +0100
+++ sjfonts-2.0.2/debian/changelog 2011-12-10 19:32:18.000000000 +0100
@@ -1,3 +1,24 @@
+sjfonts (2.0.2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload to achieve the goal of removing defoma
+ (and modernize the package a little bit!)
+ * Drop defoma support. Closes: #649829
+ * Drop recommends on x-ttcidfontconf
+ * Add ${misc:Depends} to dependencies to properly cope with
+ dependencies triggerred by the use of debhelper utilities
+ * Bump debhelper compatibility level to 8
+ * Bump Standards-Version to 3.9.2 (checked)
+ * Use minimal dh7-style rules file
+ * Change section to fonts
+ * Move to v3 source format (added Makefile moved to a
+ Debian-specific patch)
+ * Build-Depend on "fontforge-nox|fontforge" to avoid cluttering
+ build daemons
+ * Make reference to GPL-2 document explicitly in debian/copyright
+ * Complete Steve Jordi's copyright in debian/copyright
+
+ -- Christian Perrier <bubu...@debian.org> Sat, 10 Dec 2011 19:32:14 +0100
+
sjfonts (2.0.2-1) unstable; urgency=low
* New upstream release. Thanks to Albert Astals Cid for calling my
diff -Nru sjfonts-2.0.2/debian/control sjfonts-2.0.2/debian/control
--- sjfonts-2.0.2/debian/control 2011-12-10 19:46:59.000000000 +0100
+++ sjfonts-2.0.2/debian/control 2011-12-10 14:08:11.000000000 +0100
@@ -1,14 +1,13 @@
Source: sjfonts
-Section: x11
+Section: fonts
Priority: optional
Maintainer: Daniel Schepler <schep...@debian.org>
-Build-Depends-Indep: debhelper (>= 5.0.0), cdbs, defoma, fontforge
-Standards-Version: 3.6.2
+Build-Depends-Indep: debhelper (>= 8), fontforge-nox|fontforge
+Standards-Version: 3.9.2
Package: ttf-sjfonts
Architecture: all
-Depends: defoma
-Recommends: x-ttcidfont-conf
+Depends: ${misc:Depends}
Description: Some Juicy Fonts handwriting fonts
This package contains two handwriting fonts created by Steve Jordi,
Delphine and SteveHand, in TrueType format.
diff -Nru sjfonts-2.0.2/debian/copyright sjfonts-2.0.2/debian/copyright
--- sjfonts-2.0.2/debian/copyright 2011-12-10 19:46:59.000000000 +0100
+++ sjfonts-2.0.2/debian/copyright 2011-12-10 19:08:47.000000000 +0100
@@ -3,7 +3,7 @@
It was downloaded from http://sf.net/projects/sjfonts/
-Copyright Holder: Steve JORDI
+Copyright (C) 1997 Steve Jordi - Delphine Handwriting <st...@sjordi.com>
License:
@@ -21,4 +21,4 @@
On Debian GNU/Linux systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL'.
+License can be found in `/usr/share/common-licenses/GPL-2'.
diff -Nru sjfonts-2.0.2/debian/patches/series sjfonts-2.0.2/debian/patches/series
--- sjfonts-2.0.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ sjfonts-2.0.2/debian/patches/series 2011-12-10 14:07:13.000000000 +0100
@@ -0,0 +1 @@
+use_makefile.patch
diff -Nru sjfonts-2.0.2/debian/patches/use_makefile.patch sjfonts-2.0.2/debian/patches/use_makefile.patch
--- sjfonts-2.0.2/debian/patches/use_makefile.patch 1970-01-01 01:00:00.000000000 +0100
+++ sjfonts-2.0.2/debian/patches/use_makefile.patch 2011-12-10 14:07:00.000000000 +0100
@@ -0,0 +1,62 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ sjfonts (2.0.2-1.1) UNRELEASED; urgency=low
+ .
+ * Non-maintainer upload to achieve the goal of removing defoma
+ (and modernize the package a little bit!)
+ * Drop defoma support. Closes: #649829
+ * Drop recommends on x-ttcidfontconf
+ * Add ${misc:Depends} to dependencies to properly cope with
+ dependencies triggerred by the use of debhelper utilities
+ * Bump debhelper compatibility level to 8
+ * Bump Standards-Version to 3.9.2 (checked)
+ * Use minimal dh7-style rules file
+ * Change section to fonts
+ * Move to v3 source format
+Author: Christian Perrier <bubu...@debian.org>
+Bug-Debian: http://bugs.debian.org/649829
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ sjfonts-2.0.2/Makefile
+@@ -0,0 +1,16 @@
++FONTS = Delphine.ttf SteveHand.ttf
++TTFDIR = /usr/share/fonts/truetype/sjfonts
++
++all: $(FONTS)
++
++clean:
++ rm -f $(FONTS)
++
++%.ttf: %.sfd
++ fontforge genttf.pe $< $@
++
++install:
++ install -d -m 755 $(DESTDIR)/$(TTFDIR)
++ install -m 644 $(FONTS) $(DESTDIR)/$(TTFDIR)
++
++.SUFFIXES: .ttf .sfd
+--- /dev/null
++++ sjfonts-2.0.2/genttf.pe
+@@ -0,0 +1,4 @@
++#!/usr/bin/fontforge
++
++Open($1);
++Generate($2);
diff -Nru sjfonts-2.0.2/debian/postinst sjfonts-2.0.2/debian/postinst
--- sjfonts-2.0.2/debian/postinst 1970-01-01 01:00:00.000000000 +0100
+++ sjfonts-2.0.2/debian/postinst 2011-12-10 13:59:25.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-sjfonts.hints 2.0.2-2 -- "$@"
+fi
+
+#DEBHELPER#
diff -Nru sjfonts-2.0.2/debian/postrm sjfonts-2.0.2/debian/postrm
--- sjfonts-2.0.2/debian/postrm 1970-01-01 01:00:00.000000000 +0100
+++ sjfonts-2.0.2/debian/postrm 2011-12-10 13:59:25.000000000 +0100
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-sjfonts.hints 2.0.2-2 -- "$@"
+fi
+
+#DEBHELPER#
diff -Nru sjfonts-2.0.2/debian/preinst sjfonts-2.0.2/debian/preinst
--- sjfonts-2.0.2/debian/preinst 1970-01-01 01:00:00.000000000 +0100
+++ sjfonts-2.0.2/debian/preinst 2011-12-10 13:59:24.000000000 +0100
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if dpkg --compare-versions "$2" lt 2.0.2-2; then
+ if [ -x "which defoma-font 2>/dev/null" ]; then
+ defoma-font purge /etc/defoma/hints/ttf-sjfonts.hints
+ fi
+fi
+
+
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/defoma/hints/ttf-sjfonts.hints 2.0.2-2 -- "$@"
+fi
+
+#DEBHELPER#
diff -Nru sjfonts-2.0.2/debian/rules sjfonts-2.0.2/debian/rules
--- sjfonts-2.0.2/debian/rules 2011-12-10 19:46:59.000000000 +0100
+++ sjfonts-2.0.2/debian/rules 2011-12-10 14:02:57.000000000 +0100
@@ -1,9 +1,3 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
-
-DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(DEB_DESTDIR)
-
-binary-install/ttf-sjfonts::
- dh_installdefoma -pttf-sjfonts
+%:
+ dh $@
diff -Nru sjfonts-2.0.2/debian/source/format sjfonts-2.0.2/debian/source/format
--- sjfonts-2.0.2/debian/source/format 1970-01-01 01:00:00.000000000 +0100
+++ sjfonts-2.0.2/debian/source/format 2011-12-10 14:04:37.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru sjfonts-2.0.2/debian/ttf-sjfonts.defoma-hints sjfonts-2.0.2/debian/ttf-sjfonts.defoma-hints
--- sjfonts-2.0.2/debian/ttf-sjfonts.defoma-hints 2011-12-10 19:46:59.000000000 +0100
+++ sjfonts-2.0.2/debian/ttf-sjfonts.defoma-hints 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-category truetype
-begin /usr/share/fonts/truetype/sjfonts/Delphine.ttf
- Family = Delphine
- FontName = Delphine
- Encoding = Unicode
- Location = English
- Charset = ISO8859-1
- GeneralFamily = SansSerif
- Weight = Book
- Width = Variable
- Shape = Upright
- Priority = 20
-end
-begin /usr/share/fonts/truetype/sjfonts/SteveHand.ttf
- Family = Steve
- FontName = SteveHand
- Encoding = Unicode
- Location = English
- Charset = ISO8859-1
- GeneralFamily = SansSerif
- Weight = Book
- Width = Variable
- Shape = Italic
- Priority = 20
-end
diff -Nru sjfonts-2.0.2/genttf.pe sjfonts-2.0.2/genttf.pe
--- sjfonts-2.0.2/genttf.pe 2011-12-10 19:46:59.000000000 +0100
+++ sjfonts-2.0.2/genttf.pe 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#!/usr/bin/fontforge
-
-Open($1);
-Generate($2);
diff -Nru sjfonts-2.0.2/Makefile sjfonts-2.0.2/Makefile
--- sjfonts-2.0.2/Makefile 2011-12-10 19:46:59.000000000 +0100
+++ sjfonts-2.0.2/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-FONTS = Delphine.ttf SteveHand.ttf
-TTFDIR = /usr/share/fonts/truetype/sjfonts
-
-all: $(FONTS)
-
-clean:
- rm -f $(FONTS)
-
-%.ttf: %.sfd
- fontforge genttf.pe $< $@
-
-install:
- install -d -m 755 $(DESTDIR)/$(TTFDIR)
- install -m 644 $(FONTS) $(DESTDIR)/$(TTFDIR)
-
-.SUFFIXES: .ttf .sfd
