The diff for the NMU was amended, due to the transitional package
causing problems. It has now been removed.
Regards,
Roger
diff -urN dict-gcide-0.48.original/debian/changelog
dict-gcide-0.48/debian/changelog
--- dict-gcide-0.48.original/debian/changelog 2005-07-19 20:35:08.000000000
+0100
+++ dict-gcide-0.48/debian/changelog 2005-07-19 22:32:46.306985376 +0100
@@ -1,3 +1,14 @@
+dict-gcide (0.48-4.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Apply patch from Andreas Jochens to allow building with
+ GCC 3.4 and 4.0, replacing the non-standard preprocessor
+ macro __FUNCTION__ with the C99 __func__ (Closes: #263337).
+ * debian/rules, debian/control: Remove statically-versioned
+ dict-web1913 transitional package.
+
+ -- Roger Leigh <[EMAIL PROTECTED]> Tue, 19 Jul 2005 22:31:41 +0100
+
dict-gcide (0.48-4) unstable; urgency=low
* Corrected format of Build-Depends-Indep: Closes: #218709
diff -urN dict-gcide-0.48.original/debian/control dict-gcide-0.48/debian/control
--- dict-gcide-0.48.original/debian/control 2005-07-19 20:35:08.000000000
+0100
+++ dict-gcide-0.48/debian/control 2005-07-19 22:31:39.199187312 +0100
@@ -31,11 +31,3 @@
Replaces: dict-web1913
Conflicts: dict-web1913 (<= 1.4-0.47pd-3)
-Package: dict-web1913
-Section: text
-Priority: optional
-Architecture: all
-Description: Empty package to assist the transition to dict-gcide
- .
- This package may be removed after dict-gcide is installed.
-Depends: dict-gcide, debconf
diff -urN dict-gcide-0.48.original/debian/rules dict-gcide-0.48/debian/rules
--- dict-gcide-0.48.original/debian/rules 2005-07-19 20:35:08.000000000
+0100
+++ dict-gcide-0.48/debian/rules 2005-07-19 22:30:52.522283280 +0100
@@ -4,8 +4,8 @@
## rules ---
## Author : Robert D. Hilliard <hilliard@@debian.org>
## Created On : Sun, 19 Apr 1998 23:33:01 -0400
-## Last Modified By : Robert D. Hilliard <hilliard@@debian.org>
-## Last Modified On : Tue, 03 Jun 2003 17:47:17 -0400
+## Last Modified By : Roger Leigh <[EMAIL PROTECTED]>
+## Last Modified On : Tue, 19 Jul 2005 22:30:36 +0100
## Status : $Id: rules,v 0.16 2003/06/03 21:48:14 bob Exp bob $
## Last Changes : $Log: rules,v $
## Last Changes : Revision 0.16 2003/06/03 21:48:14 bob
@@ -25,7 +25,6 @@
# The name of the package (for example, `emacs').
pkg1 := dict-gcide
-pkg2 := dict-web1913
# Configuration variables (these should be pretty generic)
CC = cc
@@ -43,7 +42,7 @@
export LC_ALL=C
FILES_TO_CLEAN = debian/files debian/*~ *~ *.dict* *.index
-DIRS_TO_CLEAN = debian/$(pkg1) debian/$(pkg2)
+DIRS_TO_CLEAN = debian/$(pkg1)
STAMPS_TO_CLEAN = stamp-configure stamp-build stamp-binary-indep
DICTDIR = debian/$(pkg1)/usr/share/dictd
@@ -112,16 +111,6 @@
chown -R root.root debian/$(pkg1)
dpkg --build debian/$(pkg1) ..
- $(make_directory) debian/$(pkg2)/DEBIAN
- $(install_program) debian/postinst.web debian/$(pkg2)/DEBIAN/postinst
- $(install_program) debian/postrm.web debian/$(pkg2)/DEBIAN/postrm
- $(install_program) debian/config debian/$(pkg2)/DEBIAN/
- $(install_file) debian/templates debian/$(pkg2)/DEBIAN/
-
- dpkg-gencontrol -isp -p$(pkg2) -v1.4-0.47pd-9 -Pdebian/$(pkg2)
- chown -R root.root debian/$(pkg2)
- dpkg --build debian/$(pkg2) ..
-
touch stamp-binary-indep
diff -urN dict-gcide-0.48.original/libmaa/parse.c dict-gcide-0.48/libmaa/parse.c
--- dict-gcide-0.48.original/libmaa/parse.c 1998-02-22 19:32:36.000000000
+0000
+++ dict-gcide-0.48/libmaa/parse.c 2005-07-19 20:38:19.674872128 +0100
@@ -75,7 +75,7 @@
if (!cpp) {
if ((cpp = getenv( "KHEPERA_CPP" ))) {
- PRINTF(MAA_PARSE,(__FUNCTION__ ": Using KHEPERA_CPP from %s\n",cpp));
+ PRINTF(MAA_PARSE,("%s: Using KHEPERA_CPP from %s\n",__func__,cpp));
}
/* Always look for gcc's cpp first, since
@@ -86,7 +86,7 @@
if (fread( buf, 1, 1023, tmp ) > 0) {
if ((t = strchr( buf, '\n' ))) *t = '\0';
- PRINTF(MAA_PARSE,(__FUNCTION__ ": Using GNU cpp from %s\n",buf));
+ PRINTF(MAA_PARSE,("%s: Using GNU cpp from %s\n",__func__,buf));
cpp = str_find( buf );
extra_options = "-nostdinc -nostdinc++";
}
@@ -103,7 +103,7 @@
for (pt = cpps; **pt; pt++) {
if (!access( *pt, X_OK )) {
PRINTF(MAA_PARSE,
- (__FUNCTION__ ": Using system cpp from %s\n",*pt));
+ ("%s: Using system cpp from %s\n",__func__,*pt));
cpp = *pt;
break;
}
@@ -111,8 +111,8 @@
}
if (!cpp)
- err_fatal( __FUNCTION__,
- "Cannot locate cpp -- set KHEPERA_CPP to cpp's path\n" );
+ err_fatal("%s:Cannot locate cpp -- set KHEPERA_CPP to cpp's path\n",
+ __func__ );
}
buffer = alloca( strlen( cpp )
@@ -123,10 +123,9 @@
sprintf( buffer, "%s -I. %s %s 2>/dev/null", cpp,
_prs_cpp_options ? _prs_cpp_options : "", filename );
- PRINTF(MAA_PARSE,(__FUNCTION__ ": %s\n",buffer));
+ PRINTF(MAA_PARSE,("%s: %s\n",__func__,buffer));
if (!(yyin = popen( buffer, "r" )))
- err_fatal_errno( __FUNCTION__,
- "Cannot open \"%s\" for read\n", filename );
+ err_fatal_errno("%s Cannot open \"%s\" for read\n", __func__, filename );
src_new_file( filename );
yydebug = _prs_debug_flag;
@@ -144,11 +143,10 @@
void prs_file_nocpp( const char *filename )
{
if (!filename)
- err_fatal( __FUNCTION__, "No filename specified\n" );
+ err_fatal( "%s No filename specified\n", __func__ );
if (!(yyin = fopen( filename, "r" )))
- err_fatal_errno( __FUNCTION__,
- "Cannot open \"%s\" for read\n", filename );
+ err_fatal_errno( "%s Cannot open \"%s\" for read\n", __func__, filename
);
src_new_file( filename );
yydebug = _prs_debug_flag;
--
Roger Leigh
Printing on GNU/Linux? http://gimp-print.sourceforge.net/
Debian GNU/Linux http://www.debian.org/
GPG Public Key: 0x25BFB848. Please sign and encrypt your mail.
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
