Hi Attached the patch for the version I intend to upload. Please respond if you don't want this NMU to happen, if you are working yourself on a patch or if you think that the attached patch won't work.
Cheers Luk -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u vflib2-2.25.1/debian/control vflib2-2.25.1/debian/control
--- vflib2-2.25.1/debian/control
+++ vflib2-2.25.1/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Masato Taruishi <[EMAIL PROTECTED]>
Standards-Version: 3.5.7.0
-Build-Depends: cdbs, debhelper (>= 4.0), xutils, xlibs-dev, libttf-dev, defoma
(>= 0.7.0)
+Build-Depends: cdbs, debhelper (>= 4.0), xutils, libx11-dev, x-dev,
libttf-dev, defoma (>= 0.7.0)
Package: vflib2
Architecture: any
@@ -30,7 +30,7 @@
Section: utils
Depends: ${shlibs:Depends}
Replaces: vflib2 (<< 2.25.1-1)
-Description: Miscelanious tools for VFlib2 library
+Description: Miscellanious tools for VFlib2 library
VFlib2 is a font library written in C providing several functions to
obtain bitmaps of characters. VFlib hides the font format of font files
and provides a unified API for all supported font formats.
diff -u vflib2-2.25.1/debian/changelog vflib2-2.25.1/debian/changelog
--- vflib2-2.25.1/debian/changelog
+++ vflib2-2.25.1/debian/changelog
@@ -1,3 +1,12 @@
+vflib2 (2.25.1-18.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Split xlibs-dev build-dep (Closes: #346881).
+ * Fix FTBFS on amd64 (Closes: #297945).
+ * Fix spelling mistake in description (Closes: #125455, #127324).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Wed, 11 Jan 2006 18:34:56 +0100
+
vflib2 (2.25.1-18) unstable; urgency=low
* Maintainer Release (closes; #200972, #201625)
only in patch2:
unchanged:
--- vflib2-2.25.1.orig/src/fman.c
+++ vflib2-2.25.1/src/fman.c
@@ -470,6 +470,7 @@
return TRUE;
}
+Private void ReturnCache();
/*
* CacheIt() --- cache it. The cache slot is moved into
@@ -480,7 +481,6 @@
int port;
{
CACHE *cptr;
- Private void ReturnCache();
if ((cptr = RequireCache()) == (CACHE*)NULL){
fprintf(stderr, "VFlib: CacheIt() - error\n");
@@ -534,6 +534,8 @@
** LRU LIST
**/
+Private int LRUPutTop2();
+
/* LRUMoveTop() - moves a cache block into the top of LRU list.
* THE CACHE *MUST* BE IN LRU LIST.
*/
@@ -542,7 +544,6 @@
CACHE *cptr;
{
CACHE *cptr_b, *cptr_f;
- Private int LRUPutTop2();
cptr_b = cptr->l_back;
cptr_f = cptr->l_forw;
@@ -551,6 +552,8 @@
return LRUPutTop2(cptr, FALSE);
}
+Private int LRUPutTop2();
+
/* LRUPutTop() - puts a cache into the top of LRU list.
* THE CACHE *MUST NOT* BE IN LRU LIST.
*/
@@ -558,7 +561,6 @@
LRUPutTop(cptr)
CACHE *cptr;
{
- Private int LRUPutTop2();
return LRUPutTop2(cptr, TRUE);
}
only in patch2:
unchanged:
--- vflib2-2.25.1.orig/src/VF_FNTWV.c
+++ vflib2-2.25.1/src/VF_FNTWV.c
@@ -175,6 +175,7 @@
Private int read_word();
Private long read_long();
+Private int ReadCapa();
Public FontObj*
@@ -183,7 +184,6 @@
{
Font *font;
FontObj *fobj;
- Private int ReadCapa();
if ((font = (Font*) malloc(sizeof(Font))) == NULL){
printf("in CreateFont malloc() Error!\n");
@@ -216,22 +216,22 @@
return fobj;
}
+Private int FNTWVOpenFont();
Private int
OpenFont(obj)
FontObj *obj;
{
- Private int FNTWVOpenFont();
return FNTWVOpenFont((Font*) obj->Locals);
}
+Private int FNTWVCloseFont();
Private int
CloseFont(obj)
FontObj *obj;
{
- Private int FNTWVCloseFont();
return FNTWVCloseFont((Font*) obj->Locals);
}
signature.asc
Description: OpenPGP digital signature
