diff -u fpc-2.2.2/debian/control fpc-2.2.2/debian/control --- fpc-2.2.2/debian/control +++ fpc-2.2.2/debian/control @@ -1,7 +1,8 @@ Source: fpc Section: devel Priority: optional -Maintainer: Carlos Laviola +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Carlos Laviola Uploaders: Torsten Werner , Mazen Neifer Standards-Version: 3.8.0 Build-Depends: debhelper (>= 5), quilt, fp-compiler (>= 2.0.4), fp-units-base, diff -u fpc-2.2.2/debian/changelog fpc-2.2.2/debian/changelog --- fpc-2.2.2/debian/changelog +++ fpc-2.2.2/debian/changelog @@ -1,3 +1,10 @@ +fpc (2.2.2-3ubuntu1) intrepid; urgency=low + + * Added patch to fix fp-units-gtk2 undefined references which is equal + to LP-bug: 260464. + + -- Paul Gevers Sun, 28 Sep 2008 18:39:30 -0500 + fpc (2.2.2-3) unstable; urgency=low * Add *.fpc files to the binary package fpc-source. diff -u fpc-2.2.2/debian/patches/series fpc-2.2.2/debian/patches/series --- fpc-2.2.2/debian/patches/series +++ fpc-2.2.2/debian/patches/series @@ -1 +1,2 @@ +unneeded_symbols.patch manpages.diff only in patch2: unchanged: --- fpc-2.2.2.orig/debian/patches/unneeded_symbols.patch +++ fpc-2.2.2/debian/patches/unneeded_symbols.patch @@ -0,0 +1,65 @@ +Fixes undefined references due to GtkFileSystemError removal from GTK +Launchpad error: https://bugs.launchpad.net/ubuntu/+source/fpc/+bug/260464 + +Index: fpc-2.2.2/fpcsrcpackages/gtk2/src/gtk+/gtk/gtk2.pas +=================================================================== +--- fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas ++++ fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas (working copy) +@@ -63,6 +63,8 @@ + {$DEFINE HasGTK2_8} + {$ENDIF} + ++// {$define HasGTK_FileSystem} ++ + interface + + uses +Index: fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc +=================================================================== +--- fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc ++++ fpc-2.2.2/fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc (working copy) +@@ -115,17 +115,14 @@ + + {$IFDEF read_interface_rest} + ++{$ifdef HasGTK_FileSystem} + + { GError enumeration for GtkFileSystem } + + function GTK_FILE_SYSTEM_ERROR : TGQuark; + +- +- + function gtk_file_system_error_quark:TGQuark;cdecl;external gtklib name 'gtk_file_system_error_quark'; + +- +- + { Boxed-type for gtk_file_folder_get_info() results } + + function GTK_TYPE_FILE_INFO : GType; +@@ -244,11 +241,16 @@ + { GtkFileSystem modules support } + + function _gtk_file_system_create(file_system_name:Pchar):PGtkFileSystem;cdecl;external gtklib name '_gtk_file_system_create'; ++ ++{$endif HasGTK_FileSystem} ++ + {$endif} {read_interface_rest} + + + {$ifdef read_implementation} + ++{$ifdef HasGTK_FileSystem} ++ + function GTK_FILE_SYSTEM_ERROR : TGQuark; + begin + GTK_FILE_SYSTEM_ERROR:=gtk_file_system_error_quark; +@@ -307,6 +309,8 @@ + GTK_FILE_FOLDER_GET_IFACE:=G_TYPE_INSTANCE_GET_INTERFACE(inst,GTK_TYPE_FILE_FOLDER); + end; + ++{$endif HasGTK_FileSystem} ++ + function gtk_file_path_new_dup(str : Pgchar) : PGtkFilePath; + begin + gtk_file_path_new_dup:=PGtkFilePath(g_strdup(str));