[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: xfonts-base_1.0.0-5.1_i386.changes ACCEPTED



On Mon, 06 Apr 2009 18:02:12 +0200
Julien Cristau <jcristau@debian.org> wrote:
> On Wed, 2009-04-01 at 12:34 +0200, Julien Cristau wrote:
> > Please consider sending the NMU debdiff to the bug, though, so we can
> > review/integrate it.
> 
> ping?

 Here is a patch, including fixing bug and some stuff for packaging.
 Please review it, thanks.

 

-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/iijmio-mail.jp
 http://wiki.debian.org/HidekiYamane
diff -u xfonts-base-1.0.0/debian/changelog xfonts-base-1.0.0/debian/changelog
--- xfonts-base-1.0.0/debian/changelog
+++ xfonts-base-1.0.0/debian/changelog
@@ -1,3 +1,22 @@
+xfonts-base (1:1.0.0-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+    - Standards-Version: 3.8.1
+    - new section "fonts"
+    - Build-Depends: debhelper (>=7)
+    - add "Homepage:" field
+    - fix "I: xfonts-base source: build-depends-without-arch-dep"
+      so "Build-Depends-Indep: pkg-config, xfonts-utils", and add quilt
+  * debian/compat: set 7
+  * debian/patches:
+    - add "remove-wrongly-registered-katakana-glyphs" (Closes: #423315)
+  * debian/rules:
+    - fix "W: xfonts-base source: dh-clean-k-is-deprecated"
+  * debian/watch: add it.
+
+ -- Hideki Yamane (Debian-JP) <henrich@debian.or.jp>  Tue, 31 Mar 2009 00:23:45 +0900
+
 xfonts-base (1:1.0.0-5) unstable; urgency=low
 
   [ Branden Robinson ]
diff -u xfonts-base-1.0.0/debian/compat xfonts-base-1.0.0/debian/compat
--- xfonts-base-1.0.0/debian/compat
+++ xfonts-base-1.0.0/debian/compat
@@ -1 +1 @@
-5
+7
diff -u xfonts-base-1.0.0/debian/control xfonts-base-1.0.0/debian/control
--- xfonts-base-1.0.0/debian/control
+++ xfonts-base-1.0.0/debian/control
@@ -1,10 +1,12 @@
 Source: xfonts-base
-Section: x11
+Section: fonts
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.31), pkg-config, xfonts-utils
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: pkg-config, xfonts-utils, quilt
+Standards-Version: 3.8.1
+Homepage: http://xorg.freedesktop.org/releases/individual/font/
 
 Package: xfonts-base
 Architecture: all
diff -u xfonts-base-1.0.0/debian/rules xfonts-base-1.0.0/debian/rules
--- xfonts-base-1.0.0/debian/rules
+++ xfonts-base-1.0.0/debian/rules
@@ -51,7 +51,7 @@
 
 
 build: prepare build-stamp
-build-stamp:
+build-stamp: patch
 	dh_testdir
 	for FILE in "$(SUBDIRS)"; do \
 		echo "$$FILE"; \
@@ -66,7 +66,7 @@
 	done
 	>$@
 
-clean: xsfclean
+clean: unpatch xsfclean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -81,7 +81,7 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_clean
 	dh_installdirs
 	for FILE in "$(SUBDIRS)"; do \
 		cd "$$FILE"-obj-$(DEB_BUILD_GNU_TYPE) \
only in patch2:
unchanged:
--- xfonts-base-1.0.0.orig/debian/watch
+++ xfonts-base-1.0.0/debian/watch
@@ -0,0 +1,17 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+http://xorg.freedesktop.org/releases/individual/font/font-sun-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-jis-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-arabic-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-micro-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-cursor-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-misc-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-daewoo-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-mutt-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-dec-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-schumacher-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-isas-misc-(.*)\.tar\.gz
+http://xorg.freedesktop.org/releases/individual/font/font-sony-misc-(.*)\.tar\.gz
+
+
only in patch2:
unchanged:
--- xfonts-base-1.0.0.orig/debian/patches/remove-wrongly-registered-katakana-glyphs
+++ xfonts-base-1.0.0/debian/patches/remove-wrongly-registered-katakana-glyphs
@@ -0,0 +1,97 @@
+fix wrong glyphs in Katakana font
+Index: xfonts-base-1.0.0/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf
+===================================================================
+--- xfonts-base-1.0.0.orig/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf	2009-03-30 15:55:54.000000000 +0900
++++ xfonts-base-1.0.0/font-schumacher-misc-X11R7.0-1.0.0/clR6x12.bdf	2009-03-30 15:56:00.000000000 +0900
+@@ -46,7 +46,7 @@
+ CAP_HEIGHT 8
+ X_HEIGHT 5
+ ENDPROPERTIES
+-CHARS 1197
++CHARS 1193
+ STARTCHAR char0
+ ENCODING 0
+ SWIDTH 480 0
+@@ -22657,82 +22657,6 @@
+ 08
+ 00
+ ENDCHAR
+-STARTCHAR uni30D0
+-ENCODING 12496
+-SWIDTH 480 0
+-DWIDTH 6 0
+-BBX 6 12 0 -3
+-BITMAP
+-40
+-F8
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-ENDCHAR
+-STARTCHAR uni30D1
+-ENCODING 12497
+-SWIDTH 480 0
+-DWIDTH 6 0
+-BBX 6 12 0 -3
+-BITMAP
+-10
+-F8
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-00
+-ENDCHAR
+-STARTCHAR uni30D2
+-ENCODING 12498
+-SWIDTH 480 0
+-DWIDTH 6 0
+-BBX 6 12 0 -3
+-BITMAP
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-ENDCHAR
+-STARTCHAR uni30D3
+-ENCODING 12499
+-SWIDTH 480 0
+-DWIDTH 6 0
+-BBX 6 12 0 -3
+-BITMAP
+-00
+-00
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-20
+-00
+-00
+-ENDCHAR
+ STARTCHAR fi
+ ENCODING 64257
+ SWIDTH 480 0
only in patch2:
unchanged:
--- xfonts-base-1.0.0.orig/debian/patches/series
+++ xfonts-base-1.0.0/debian/patches/series
@@ -0,0 +1 @@
+remove-wrongly-registered-katakana-glyphs

Reply to: