diff -u asis-2005/debian/changelog asis-2005/debian/changelog --- asis-2005/debian/changelog +++ asis-2005/debian/changelog @@ -1,3 +1,14 @@ +asis (2005-5ubuntu0.1) hardy; urgency=low + + * Rebuild for gnat-4.2 transition (LP #: 268458) + * Replaced gnat-4.1 with gnat on asis-programs build-dep + * Added tree_versioning_fix.patch to allow compilation under gnat-4.2 + * Fixed quilt rules to work in all cases + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Michael Casadevall Thu, 21 Aug 2008 21:19:13 +0000 + asis (2005-5) unstable; urgency=low * debian/control: add support for alpha and s390. diff -u asis-2005/debian/rules asis-2005/debian/rules --- asis-2005/debian/rules +++ asis-2005/debian/rules @@ -14,6 +14,8 @@ # /usr/share/common-licenses/GPL. If not, write to the Free Software # Foundation, 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +include /usr/share/quilt/quilt.make + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -33,9 +35,6 @@ LIBASIS := libasis.so.$(VERSION) CPUS := $(shell getconf _NPROCESSORS_ONLN) -patch: - -quilt push -a - clean: dh_testdir -quilt pop -a @@ -44,7 +43,7 @@ -rm -rf debian/obj $(TOOLS) dh_clean -build: patch obj/libasis.a obj/libasis.so tools +build: $(QUILT_STAMPFN) obj/libasis.a obj/libasis.so tools obj/libasis.a: asis/* : # Build the static library @@ -69,7 +68,7 @@ tools: : # Build the tools, link dynamically against libasis.so -mkdir debian/obj - gnatmake -j$(CPUS) -Pdebian/tools.gpr -largs -Lobj -lasis + gnatmake -j$(CPUS) -Pdebian/tools.gpr -largs -Lobj -lasis -lgnatvsn binary: checks binary-arch binary-indep diff -u asis-2005/debian/control asis-2005/debian/control --- asis-2005/debian/control +++ asis-2005/debian/control @@ -1,5 +1,6 @@ Source: asis -Maintainer: Ludovic Brenta +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ludovic Brenta Section: libdevel Priority: optional Standards-Version: 3.7.2 @@ -10,7 +11,7 @@ Section: libdevel Conflicts: libasis-3.15p-1-dev Replaces: libasis-3.15p-1-dev -Depends: libasis2005 (= ${Source-Version}), gnat-4.1, libgnatvsn-dev (>= 4.1) +Depends: libasis2005 (= ${Source-Version}), gnat, libgnatvsn-dev (>= 4.1) Description: Ada Semantic Interface Specification (ASIS) headers and libraries ASIS (Ada Semantic Interface Specification) lets you develop applications to walk through the sources of your Ada programs and examine the semantic @@ -21,7 +22,7 @@ Package: asis-programs Architecture: alpha amd64 hppa i386 ia64 kfreebsd-i386 powerpc s390 sparc Section: devel -Depends: gnat-4.1, ${shlibs:Depends} +Depends: gnat, ${shlibs:Depends} Description: Ada Semantic Interface Specification (ASIS) example programs ASIS (Ada Semantic Interface Specification) lets you develop applications to walk through the sources of your Ada programs and examine the semantic reverted: --- asis-2005/patches/gcc-4.1.patch +++ asis-2005.orig/patches/gcc-4.1.patch @@ -1,290 +0,0 @@ -ASIS 2006 normally requires GNAT GPL 2006 Edition, and in particular -its GNATVSN unit. This unit is slightly different in GCC 4.1; this -patch makes it possible to build ASIS 2006 with GCC 4.1. - --- -Ludovic Brenta, 2006-06-18 - - -Index: asis-2006/asis/a4g-gnat_int.adb -=================================================================== ---- asis-2006.orig/asis/a4g-gnat_int.adb 2006-06-18 18:27:06.000000000 +0200 -+++ asis-2006/asis/a4g-gnat_int.adb 2006-06-18 18:30:46.000000000 +0200 -@@ -235,7 +235,7 @@ - Pattern => "(") + 1; - - First_T_Idx := -- Index (Source => Tree_Version_String.all, -+ Index (Source => Opt.Tree_Version_String, - Pattern => "(") + 1; - - Last_A_Idx := -@@ -243,11 +243,11 @@ - Pattern => "-") - 1; - - Last_T_Idx := -- Index (Source => Tree_Version_String.all, -+ Index (Source => Opt.Tree_Version_String, - Pattern => "-") - 1; - - if ASIS_GNAT_V (First_A_Idx .. Last_A_Idx) /= -- Tree_Version_String (First_T_Idx .. Last_T_Idx) -+ Opt.Tree_Version_String (First_T_Idx .. Last_T_Idx) - then - Close (Desc, File_Closed); - Ada.Exceptions.Raise_Exception -Index: asis-2006/asis/a4g-vcheck.adb -=================================================================== ---- asis-2006.orig/asis/a4g-vcheck.adb 2006-06-18 18:16:40.000000000 +0200 -+++ asis-2006/asis/a4g-vcheck.adb 2006-06-18 18:22:50.000000000 +0200 -@@ -54,7 +54,6 @@ - with A4G.A_Output; use A4G.A_Output; - - with Fname; use Fname; --with Gnatvsn; use Gnatvsn; - with Lib; use Lib; - with Namet; use Namet; - with Output; use Output; -@@ -306,9 +305,6 @@ - -- What else??? - ) - is -- Is_GPL_Version : constant Boolean := Get_Gnat_Build_Type = GPL; -- Is_FSF_Version : constant Boolean := Get_Gnat_Build_Type = FSF; -- - procedure Repeat_Char (Char : Character; Col : Nat; After : Character); - -- This procedure is similar to Comperr.Repeat_Char, but it does nothing - -- if Generate_Bug_Box is set OFF. -@@ -510,54 +506,8 @@ - end if; - - -- Completing the bug box -- -- if Is_FSF_Version then -- Write_Str -- ("| Please submit a bug report; see" & -- " http://gcc.gnu.org/bugs.html."); -- End_Line; -- -- elsif Is_GPL_Version then -- -- Write_Str -- ("| Please submit a bug report by email " & -- "to report@adacore.com."); -- End_Line; -- -- Write_Str -- ("| GAP members can alternatively use GNAT Tracker:"); -- End_Line; -- -- Write_Str -- ("| http://www.adacore.com/ " & -- "section 'send a report'."); -- End_Line; -- -- Write_Str -- ("| See gnatinfo.txt for full info on procedure " & -- "for submitting bugs."); -- End_Line; -- -- else -- Write_Str -- ("| Please submit a bug report using GNAT Tracker:"); -- End_Line; -- -- Write_Str -- ("| http://www.adacore.com/gnattracker/ " & -- "section 'send a report'."); -- End_Line; -- -- Write_Str -- ("| alternatively submit a bug report by email " & -- "to report@adacore.com,"); -- End_Line; -- -- Write_Str -- ("| including your customer number #nnn " & -- "in the subject line."); -- End_Line; -- end if; -+ Write_Str ("| Please submit a bug report; use reportbug(1) or see " & -+ "http://www.debian.org/Bugs/Reporting."); - - Write_Str - ("| Use a subject line meaningful to you and us to track the bug."); -@@ -592,10 +542,8 @@ - ("| (concatenated together with no headers between files)."); - End_Line; - -- if not Is_FSF_Version then -- Write_Str ("| Use plain ASCII or MIME attachment."); -- End_Line; -- end if; -+ Write_Str ("| Use plain ASCII or MIME attachment."); -+ End_Line; - - Write_Str - ("| NOTE: ASIS bugs may be submitted to asis-report@adacore.com"); -Index: asis-2006/asis/asis-implementation.adb -=================================================================== ---- asis-2006.orig/asis/asis-implementation.adb 2006-06-18 18:12:54.000000000 +0200 -+++ asis-2006/asis/asis-implementation.adb 2006-06-18 18:13:47.000000000 +0200 -@@ -73,9 +73,7 @@ - function ASIS_Implementor_Information return Wide_String is - begin - return -- "Copyright (C) 1995-" & -- To_Wide_String (Gnatvsn.Current_Year) & -- ", Free Software Foundation"; -+ "Copyright (C) 1995-2006, Free Software Foundation"; - end ASIS_Implementor_Information; - - ------------------------------ -Index: asis-2006/tools/asistant/asistant-common.adb -=================================================================== ---- asis-2006.orig/tools/asistant/asistant-common.adb 2006-06-18 18:45:14.000000000 +0200 -+++ asis-2006/tools/asistant/asistant-common.adb 2006-06-18 18:46:52.000000000 +0200 -@@ -31,12 +31,8 @@ - -- -- - ------------------------------------------------------------------------------ - --with Ada.Characters.Handling; -- - with ASIStant.Text_IO; use ASIStant.Text_IO; - --with Gnatvsn; -- - package body ASIStant.Common is - - ------------------------------------------------------------------------------ -@@ -129,10 +125,7 @@ - begin - ATIPut_Line ("ASIStant - ASIS Tester And iNTerpreter, v1.5", 3); - -- ATIPut ("(C) 1997-", 3); -- ATIPut -- (Ada.Characters.Handling.To_Wide_String (Gnatvsn.Current_Year), 3); -- ATIPut_Line (", Free Software Foundation, Inc.", 3); -+ ATIPut ("(C) 1997-2006, Free Software Foundation, Inc.", 3); - end Print_ASIStant_Header; - - end ASIStant.Common; -Index: asis-2006/tools/gnatcheck/gnatcheck-output.adb -=================================================================== ---- asis-2006.orig/tools/gnatcheck/gnatcheck-output.adb 2006-06-18 19:02:42.000000000 +0200 -+++ asis-2006/tools/gnatcheck/gnatcheck-output.adb 2006-06-18 19:03:16.000000000 +0200 -@@ -32,8 +32,6 @@ - with ASIS_UL.Common; use ASIS_UL.Common; - with ASIS_UL.Output; use ASIS_UL.Output; - --with Gnatvsn; -- - package body Gnatcheck.Output is - - Report_File : File_Type; -@@ -55,9 +53,7 @@ - Info_No_EOL (To_String (Asis.Implementation.ASIS_Implementor_Version)); - Info (")"); - -- Info_No_EOL ("Copyright 2004-"); -- Info_No_EOL (Gnatvsn.Current_Year); -- Info (", AdaCore."); -+ Info_No_EOL ("Copyright 2004-2006, AdaCore."); - end Print_Version_Info; - - ---------------- -Index: asis-2006/tools/gnatelim/gnatelim-driver.adb -=================================================================== ---- asis-2006.orig/tools/gnatelim/gnatelim-driver.adb 2006-06-18 19:06:08.000000000 +0200 -+++ asis-2006/tools/gnatelim/gnatelim-driver.adb 2006-06-18 19:06:24.000000000 +0200 -@@ -34,8 +34,6 @@ - with ASIS_UL.Common; - with ASIS_UL.Compiler_Options; use ASIS_UL.Compiler_Options; - --with Gnatvsn; -- - with Gnatelim.Analyze; - with Gnatelim.Bind_File; - with Gnatelim.Nodes; use Gnatelim.Nodes; -@@ -228,9 +226,7 @@ - Put_Gnatelim_Version; - New_Line; - -- Put ("-- Copyright 1997-"); -- Put (To_Wide_String (Gnatvsn.Current_Year)); -- Put (", Free Software Foundation, Inc."); -+ Put ("-- Copyright 1997-2006, Free Software Foundation, Inc."); - New_Line; - end if; - -Index: asis-2006/tools/gnatmetric/metrics-output.adb -=================================================================== ---- asis-2006.orig/tools/gnatmetric/metrics-output.adb 2006-06-18 19:07:58.000000000 +0200 -+++ asis-2006/tools/gnatmetric/metrics-output.adb 2006-06-18 19:08:26.000000000 +0200 -@@ -37,8 +37,6 @@ - with Asis.Implementation; use Asis.Implementation; - with Asis.Text; use Asis.Text; - --with Gnatvsn; -- - with METRICS.ASIS_Utilities; use METRICS.ASIS_Utilities; - with METRICS.Common; use METRICS.Common; - with METRICS.Options; use METRICS.Options; -@@ -922,9 +920,7 @@ - begin - Info ("GNATMETRIC (built with " & To_String (ASIS_Implementor_Version)); - -- Info_No_EOL ("Copyright 2005-"); -- Info_No_EOL (Gnatvsn.Current_Year); -- Info (", AdaCore"); -+ Info_No_EOL ("Copyright 2005-2006, AdaCore"); - end Version_Info; - - end METRICS.Output; -Index: asis-2006/tools/gnatpp/gnatpp-output.adb -=================================================================== ---- asis-2006.orig/tools/gnatpp/gnatpp-output.adb 2006-06-18 19:10:33.000000000 +0200 -+++ asis-2006/tools/gnatpp/gnatpp-output.adb 2006-06-18 19:10:43.000000000 +0200 -@@ -31,7 +31,6 @@ - - with GNAT.OS_Lib; use GNAT.OS_Lib; - --with Gnatvsn; - with Hostparm; - - with Asis.Implementation; use Asis.Implementation; -@@ -753,9 +752,7 @@ - Put (")"); - New_Line; - -- Put ("Copyright 2003-"); -- Put (To_Wide_String (Gnatvsn.Current_Year)); -- Put (", AdaCore."); -+ Put ("Copyright 2003-2006, AdaCore."); - New_Line; - - Set_Output (Tmp_Output.all); -Index: asis-2006/tools/gnatstub/gnatstub-sampler.adb -=================================================================== ---- asis-2006.orig/tools/gnatstub/gnatstub-sampler.adb 2006-06-18 19:12:37.000000000 +0200 -+++ asis-2006/tools/gnatstub/gnatstub-sampler.adb 2006-06-18 19:12:54.000000000 +0200 -@@ -63,8 +63,6 @@ - - with ASIS_UL.Compiler_Options; use ASIS_UL.Compiler_Options; - --with Gnatvsn; -- - package body Gnatstub.Sampler is - - use type Asis.Errors.Error_Kinds; -@@ -1939,9 +1937,7 @@ - New_Line (Standard_Error); - Put - (Standard_Error, -- "Copyright 1997-" & -- Gnatvsn.Current_Year & -- ", Free Software Foundation, Inc."); -+ "Copyright 1997-2006, Free Software Foundation, Inc."); - New_Line (Standard_Error); - - when others => reverted: --- asis-2005/patches/gnatgcc.patch +++ asis-2005.orig/patches/gnatgcc.patch @@ -1,14 +0,0 @@ -Explicitly use gnatgcc as the compiler driver, rather than gcc, -because gcc may not be the default Ada compiler. - ---- asis/a4g-gnat_int.adb~ -+++ asis/a4g-gnat_int.adb 2006-05-09 23:18:22.000000000 +0200 -@@ -71,7 +71,7 @@ - - LT : String renames ASIS_Line_Terminator; - Standard_GCC : constant String_Access := -- GNAT.OS_Lib.Locate_Exec_On_Path ("gcc"); -+ GNAT.OS_Lib.Locate_Exec_On_Path ("gnatgcc"); - - ----------------- - -- Create_Tree -- reverted: --- asis-2005/patches/series +++ asis-2005.orig/patches/series @@ -1,2 +0,0 @@ -gnatgcc.patch -p0 -# gcc-4.1.patch only in patch2: unchanged: --- asis-2005.orig/debian/patches/gcc-4.1.patch +++ asis-2005/debian/patches/gcc-4.1.patch @@ -0,0 +1,290 @@ +ASIS 2006 normally requires GNAT GPL 2006 Edition, and in particular +its GNATVSN unit. This unit is slightly different in GCC 4.1; this +patch makes it possible to build ASIS 2006 with GCC 4.1. + +-- +Ludovic Brenta, 2006-06-18 + + +Index: asis-2006/asis/a4g-gnat_int.adb +=================================================================== +--- asis-2006.orig/asis/a4g-gnat_int.adb 2006-06-18 18:27:06.000000000 +0200 ++++ asis-2006/asis/a4g-gnat_int.adb 2006-06-18 18:30:46.000000000 +0200 +@@ -235,7 +235,7 @@ + Pattern => "(") + 1; + + First_T_Idx := +- Index (Source => Tree_Version_String.all, ++ Index (Source => Opt.Tree_Version_String, + Pattern => "(") + 1; + + Last_A_Idx := +@@ -243,11 +243,11 @@ + Pattern => "-") - 1; + + Last_T_Idx := +- Index (Source => Tree_Version_String.all, ++ Index (Source => Opt.Tree_Version_String, + Pattern => "-") - 1; + + if ASIS_GNAT_V (First_A_Idx .. Last_A_Idx) /= +- Tree_Version_String (First_T_Idx .. Last_T_Idx) ++ Opt.Tree_Version_String (First_T_Idx .. Last_T_Idx) + then + Close (Desc, File_Closed); + Ada.Exceptions.Raise_Exception +Index: asis-2006/asis/a4g-vcheck.adb +=================================================================== +--- asis-2006.orig/asis/a4g-vcheck.adb 2006-06-18 18:16:40.000000000 +0200 ++++ asis-2006/asis/a4g-vcheck.adb 2006-06-18 18:22:50.000000000 +0200 +@@ -54,7 +54,6 @@ + with A4G.A_Output; use A4G.A_Output; + + with Fname; use Fname; +-with Gnatvsn; use Gnatvsn; + with Lib; use Lib; + with Namet; use Namet; + with Output; use Output; +@@ -306,9 +305,6 @@ + -- What else??? + ) + is +- Is_GPL_Version : constant Boolean := Get_Gnat_Build_Type = GPL; +- Is_FSF_Version : constant Boolean := Get_Gnat_Build_Type = FSF; +- + procedure Repeat_Char (Char : Character; Col : Nat; After : Character); + -- This procedure is similar to Comperr.Repeat_Char, but it does nothing + -- if Generate_Bug_Box is set OFF. +@@ -510,54 +506,8 @@ + end if; + + -- Completing the bug box +- +- if Is_FSF_Version then +- Write_Str +- ("| Please submit a bug report; see" & +- " http://gcc.gnu.org/bugs.html."); +- End_Line; +- +- elsif Is_GPL_Version then +- +- Write_Str +- ("| Please submit a bug report by email " & +- "to report@adacore.com."); +- End_Line; +- +- Write_Str +- ("| GAP members can alternatively use GNAT Tracker:"); +- End_Line; +- +- Write_Str +- ("| http://www.adacore.com/ " & +- "section 'send a report'."); +- End_Line; +- +- Write_Str +- ("| See gnatinfo.txt for full info on procedure " & +- "for submitting bugs."); +- End_Line; +- +- else +- Write_Str +- ("| Please submit a bug report using GNAT Tracker:"); +- End_Line; +- +- Write_Str +- ("| http://www.adacore.com/gnattracker/ " & +- "section 'send a report'."); +- End_Line; +- +- Write_Str +- ("| alternatively submit a bug report by email " & +- "to report@adacore.com,"); +- End_Line; +- +- Write_Str +- ("| including your customer number #nnn " & +- "in the subject line."); +- End_Line; +- end if; ++ Write_Str ("| Please submit a bug report; use reportbug(1) or see " & ++ "http://www.debian.org/Bugs/Reporting."); + + Write_Str + ("| Use a subject line meaningful to you and us to track the bug."); +@@ -592,10 +542,8 @@ + ("| (concatenated together with no headers between files)."); + End_Line; + +- if not Is_FSF_Version then +- Write_Str ("| Use plain ASCII or MIME attachment."); +- End_Line; +- end if; ++ Write_Str ("| Use plain ASCII or MIME attachment."); ++ End_Line; + + Write_Str + ("| NOTE: ASIS bugs may be submitted to asis-report@adacore.com"); +Index: asis-2006/asis/asis-implementation.adb +=================================================================== +--- asis-2006.orig/asis/asis-implementation.adb 2006-06-18 18:12:54.000000000 +0200 ++++ asis-2006/asis/asis-implementation.adb 2006-06-18 18:13:47.000000000 +0200 +@@ -73,9 +73,7 @@ + function ASIS_Implementor_Information return Wide_String is + begin + return +- "Copyright (C) 1995-" & +- To_Wide_String (Gnatvsn.Current_Year) & +- ", Free Software Foundation"; ++ "Copyright (C) 1995-2006, Free Software Foundation"; + end ASIS_Implementor_Information; + + ------------------------------ +Index: asis-2006/tools/asistant/asistant-common.adb +=================================================================== +--- asis-2006.orig/tools/asistant/asistant-common.adb 2006-06-18 18:45:14.000000000 +0200 ++++ asis-2006/tools/asistant/asistant-common.adb 2006-06-18 18:46:52.000000000 +0200 +@@ -31,12 +31,8 @@ + -- -- + ------------------------------------------------------------------------------ + +-with Ada.Characters.Handling; +- + with ASIStant.Text_IO; use ASIStant.Text_IO; + +-with Gnatvsn; +- + package body ASIStant.Common is + + ------------------------------------------------------------------------------ +@@ -129,10 +125,7 @@ + begin + ATIPut_Line ("ASIStant - ASIS Tester And iNTerpreter, v1.5", 3); + +- ATIPut ("(C) 1997-", 3); +- ATIPut +- (Ada.Characters.Handling.To_Wide_String (Gnatvsn.Current_Year), 3); +- ATIPut_Line (", Free Software Foundation, Inc.", 3); ++ ATIPut ("(C) 1997-2006, Free Software Foundation, Inc.", 3); + end Print_ASIStant_Header; + + end ASIStant.Common; +Index: asis-2006/tools/gnatcheck/gnatcheck-output.adb +=================================================================== +--- asis-2006.orig/tools/gnatcheck/gnatcheck-output.adb 2006-06-18 19:02:42.000000000 +0200 ++++ asis-2006/tools/gnatcheck/gnatcheck-output.adb 2006-06-18 19:03:16.000000000 +0200 +@@ -32,8 +32,6 @@ + with ASIS_UL.Common; use ASIS_UL.Common; + with ASIS_UL.Output; use ASIS_UL.Output; + +-with Gnatvsn; +- + package body Gnatcheck.Output is + + Report_File : File_Type; +@@ -55,9 +53,7 @@ + Info_No_EOL (To_String (Asis.Implementation.ASIS_Implementor_Version)); + Info (")"); + +- Info_No_EOL ("Copyright 2004-"); +- Info_No_EOL (Gnatvsn.Current_Year); +- Info (", AdaCore."); ++ Info_No_EOL ("Copyright 2004-2006, AdaCore."); + end Print_Version_Info; + + ---------------- +Index: asis-2006/tools/gnatelim/gnatelim-driver.adb +=================================================================== +--- asis-2006.orig/tools/gnatelim/gnatelim-driver.adb 2006-06-18 19:06:08.000000000 +0200 ++++ asis-2006/tools/gnatelim/gnatelim-driver.adb 2006-06-18 19:06:24.000000000 +0200 +@@ -34,8 +34,6 @@ + with ASIS_UL.Common; + with ASIS_UL.Compiler_Options; use ASIS_UL.Compiler_Options; + +-with Gnatvsn; +- + with Gnatelim.Analyze; + with Gnatelim.Bind_File; + with Gnatelim.Nodes; use Gnatelim.Nodes; +@@ -228,9 +226,7 @@ + Put_Gnatelim_Version; + New_Line; + +- Put ("-- Copyright 1997-"); +- Put (To_Wide_String (Gnatvsn.Current_Year)); +- Put (", Free Software Foundation, Inc."); ++ Put ("-- Copyright 1997-2006, Free Software Foundation, Inc."); + New_Line; + end if; + +Index: asis-2006/tools/gnatmetric/metrics-output.adb +=================================================================== +--- asis-2006.orig/tools/gnatmetric/metrics-output.adb 2006-06-18 19:07:58.000000000 +0200 ++++ asis-2006/tools/gnatmetric/metrics-output.adb 2006-06-18 19:08:26.000000000 +0200 +@@ -37,8 +37,6 @@ + with Asis.Implementation; use Asis.Implementation; + with Asis.Text; use Asis.Text; + +-with Gnatvsn; +- + with METRICS.ASIS_Utilities; use METRICS.ASIS_Utilities; + with METRICS.Common; use METRICS.Common; + with METRICS.Options; use METRICS.Options; +@@ -922,9 +920,7 @@ + begin + Info ("GNATMETRIC (built with " & To_String (ASIS_Implementor_Version)); + +- Info_No_EOL ("Copyright 2005-"); +- Info_No_EOL (Gnatvsn.Current_Year); +- Info (", AdaCore"); ++ Info_No_EOL ("Copyright 2005-2006, AdaCore"); + end Version_Info; + + end METRICS.Output; +Index: asis-2006/tools/gnatpp/gnatpp-output.adb +=================================================================== +--- asis-2006.orig/tools/gnatpp/gnatpp-output.adb 2006-06-18 19:10:33.000000000 +0200 ++++ asis-2006/tools/gnatpp/gnatpp-output.adb 2006-06-18 19:10:43.000000000 +0200 +@@ -31,7 +31,6 @@ + + with GNAT.OS_Lib; use GNAT.OS_Lib; + +-with Gnatvsn; + with Hostparm; + + with Asis.Implementation; use Asis.Implementation; +@@ -753,9 +752,7 @@ + Put (")"); + New_Line; + +- Put ("Copyright 2003-"); +- Put (To_Wide_String (Gnatvsn.Current_Year)); +- Put (", AdaCore."); ++ Put ("Copyright 2003-2006, AdaCore."); + New_Line; + + Set_Output (Tmp_Output.all); +Index: asis-2006/tools/gnatstub/gnatstub-sampler.adb +=================================================================== +--- asis-2006.orig/tools/gnatstub/gnatstub-sampler.adb 2006-06-18 19:12:37.000000000 +0200 ++++ asis-2006/tools/gnatstub/gnatstub-sampler.adb 2006-06-18 19:12:54.000000000 +0200 +@@ -63,8 +63,6 @@ + + with ASIS_UL.Compiler_Options; use ASIS_UL.Compiler_Options; + +-with Gnatvsn; +- + package body Gnatstub.Sampler is + + use type Asis.Errors.Error_Kinds; +@@ -1939,9 +1937,7 @@ + New_Line (Standard_Error); + Put + (Standard_Error, +- "Copyright 1997-" & +- Gnatvsn.Current_Year & +- ", Free Software Foundation, Inc."); ++ "Copyright 1997-2006, Free Software Foundation, Inc."); + New_Line (Standard_Error); + + when others => only in patch2: unchanged: --- asis-2005.orig/debian/patches/tree_versioning_fix.patch +++ asis-2005/debian/patches/tree_versioning_fix.patch @@ -0,0 +1,12 @@ +--- asis/a4g-gnat_int.adb ++++ asis/a4g-gnat_int.adb +@@ -203,7 +203,7 @@ + Ada.Exceptions.Raise_Exception + (Program_Error'Identity, "Inconsistent versions of GNAT and ASIS"); + elsif Strong_Version_Check and then +- Tree_Version_String /= Gnat_Version_String ++ Tree_Version_String(1 .. Tree_Version_String'Length) /= Gnat_Version_String + then + Close (Desc, File_Closed); + Ada.Exceptions.Raise_Exception + only in patch2: unchanged: --- asis-2005.orig/debian/patches/gnatgcc.patch +++ asis-2005/debian/patches/gnatgcc.patch @@ -0,0 +1,14 @@ +Explicitly use gnatgcc as the compiler driver, rather than gcc, +because gcc may not be the default Ada compiler. + +--- asis/a4g-gnat_int.adb~ ++++ asis/a4g-gnat_int.adb 2006-05-09 23:18:22.000000000 +0200 +@@ -71,7 +71,7 @@ + + LT : String renames ASIS_Line_Terminator; + Standard_GCC : constant String_Access := +- GNAT.OS_Lib.Locate_Exec_On_Path ("gcc"); ++ GNAT.OS_Lib.Locate_Exec_On_Path ("gnatgcc"); + + ----------------- + -- Create_Tree -- only in patch2: unchanged: --- asis-2005.orig/debian/patches/series +++ asis-2005/debian/patches/series @@ -0,0 +1,3 @@ +gnatgcc.patch -p0 +tree_versioning_fix.patch -p0 +# gcc-4.1.patch