tags 485099 = patch
thanks
On Sun, 08 Jun 2008, Ludovic Brenta wrote:
> tags 485099 wontfix
> thanks
>
> asis already uses quilt, therefore the new format costs effort for
> zero benefit. I am not planning any further work on asis for Lenny.
Please find a patch attached for this issue. It moves the patches
directory to debian/patches/ and refreshes patches to be applicable with
-p1 instead of -p0.
Cheers,
--
Raphaël Hertzog
Le best-seller français mis à jour pour Debian Etch :
http://www.ouaza.com/livre/admin-debian/
reverted:
--- asis-2007/patches/series
+++ asis-2007.orig/patches/series
@@ -1,2 +0,0 @@
-gnatgcc.patch -p0
-gcc-4.3.patch -p0
reverted:
--- asis-2007/patches/gnatgcc.patch
+++ asis-2007.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-2007/patches/gcc-4.3.patch
+++ asis-2007.orig/patches/gcc-4.3.patch
@@ -1,163 +0,0 @@
-Index: asis/asis-extensions.adb
-===================================================================
---- asis/asis-extensions.adb.orig
-+++ asis/asis-extensions.adb
-@@ -2079,7 +2079,7 @@
-
- Result : Boolean := True;
- -- the idea of the implementation is to find out the cases when
-- -- Expression is NOT a true exception, so we initialize Result
-+ -- Expression is NOT a true expression, so we initialize Result
- -- as True
- begin
- Check_Validity (Expression, Package_Name & "Is_True_Expression");
-@@ -2128,7 +2128,7 @@
- if Nkind (Arg_Node) = N_Selected_Component and then
- Etype (Arg_Node) = Any_Type
- -- for now (GNAT 3.05) this means, that Expression is an
-- -- expanded name of the character literal of ether a
-+ -- expanded name of the character literal of either a
- -- predefined character type or of the type derived from a
- -- predefined character type; the problem is that the
- -- Entity field is not set for such a node
-@@ -2152,23 +2152,24 @@
-
- if No (Entity_Node) then
- Result := False;
-- elsif Ekind (Entity_Node) = E_Enumeration_Literal then
-- null;
- else
- case Ekind (Entity_Node) is
-- -- the first choice in this case statement should
-- -- filter in entities which *ARE* expressions in Ada
-- -- sense
-+ when E_Component | E_Constant | E_Discriminant |
-+ E_Loop_Parameter | E_Out_Parameter =>
-+ null;
- when E_Variable =>
- -- tasks and protected objects declared by _single_
- -- task/protected declarations do not have
- -- corresponding type declarations which can be
- -- represented in ASIS
- Result := Comes_From_Source (Parent (Entity_Node));
-- when E_Component .. E_Named_Real |
-+ when E_In_Out_Parameter | E_In_Parameter |
-+ E_Generic_In_Out_Parameter | E_Generic_In_Parameter |
-+ E_Named_Integer | E_Named_Real =>
- -- variables and constants (including formal
- -- parameters and generic formal parameters
-- E_Enumeration_Literal | -- ??? (see elsif path)
-+ null;
-+ when E_Enumeration_Literal |
- -- enumeration literals are not treated as functions
- -- in ASIS
- E_Entry_Index_Parameter |
-Index: asis/a4g-mapping.adb
-===================================================================
---- asis/a4g-mapping.adb.orig
-+++ asis/a4g-mapping.adb
-@@ -39,6 +39,8 @@
-
- with Ada.Characters.Handling; use Ada.Characters.Handling;
-
-+with Atree; use Atree; -- from libgnatvsn
-+
- with Asis; use Asis;
- with Asis.Compilation_Units; use Asis.Compilation_Units;
- with Asis.Elements; use Asis.Elements;
-@@ -3930,7 +3932,7 @@
- Original_N : Node_Id)
- return Paren_Count_Type
- is
-- Result : Paren_Count_Type := Paren_Count (N);
-+ Result : Paren_Count_Type := Paren_Count_Type (Paren_Count (N));
- begin
-
- if Result > 0 and then
-Index: asis/a4g-gnat_int.adb
-===================================================================
---- asis/a4g-gnat_int.adb.orig
-+++ asis/a4g-gnat_int.adb
-@@ -206,7 +206,7 @@
-
- -- GNAT/ASIS version check first
-
-- if Tree_ASIS_Version_Number /= ASIS_Version_Number then
-+ if Tree_ASIS_Version_Number /= Tree_IO.ASIS_Version_Number then
- Close (Desc, File_Closed);
- Ada.Exceptions.Raise_Exception
- (Program_Error'Identity, "Inconsistent versions of GNAT and ASIS");
-Index: asis/a4g-contt-dp.adb
-===================================================================
---- asis/a4g-contt-dp.adb.orig
-+++ asis/a4g-contt-dp.adb
-@@ -138,7 +138,7 @@
- -- If not In_Unit_Id_List (U, L), U is appended to L (if L is null,
- -- new Unit_Id_List value is created)
-
-- procedure Reorder_Sem_Dependencies (Units : in out Unit_Id_List_Access);
-+ procedure Reorder_Sem_Dependencies (Units : in Unit_Id_List_Access);
- -- This procedure takes the unit list with is supposed to be the result of
- -- one of the Set_All_<Relation> functions above (that is, its parameter
- -- is not supposed to be null and it contains only existing units). It
-@@ -496,7 +496,7 @@
- -- Reorder_Sem_Dependencies --
- ------------------------------
-
-- procedure Reorder_Sem_Dependencies (Units : in out Unit_Id_List_Access) is
-+ procedure Reorder_Sem_Dependencies (Units : in Unit_Id_List_Access) is
- More_Inversion : Boolean := True;
- Tmp_Unit : Unit_Id;
- begin
-Index: asis/a4g-a_elists.adb
-===================================================================
---- asis/a4g-a_elists.adb.orig
-+++ asis/a4g-a_elists.adb
-@@ -287,7 +287,7 @@
- ---------------
-
- procedure Move_List
-- (List_From : in out Elist_Id;
-+ (List_From : in Elist_Id;
- List_To : in out Elist_Id)
- is
- begin
-Index: asis/a4g-a_elists.ads
-===================================================================
---- asis/a4g-a_elists.ads.orig
-+++ asis/a4g-a_elists.ads
-@@ -203,10 +203,10 @@
- -- equial to No_List, returns True
-
- procedure Move_List
-- (List_From : in out Elist_Id;
-+ (List_From : in Elist_Id;
- List_To : in out Elist_Id);
- -- Moves (prepends) the content of List_From to List_To. If List_To is
-- -- equial to No_Elist, it is created. For now, this procedure does not
-+ -- equal to No_Elist, it is created. For now, this procedure does not
- -- check if the elements from List_From are already in List_To, therefore
- -- as a result of a call to this procedure, List_To can contain
- -- duplicated elements
-Index: asis/a4g-mapping.ads
-===================================================================
---- asis/a4g-mapping.ads.orig
-+++ asis/a4g-mapping.ads
-@@ -64,7 +64,6 @@
- with A4G.A_Types; use A4G.A_Types;
- with A4G.Int_Knds; use A4G.Int_Knds;
-
--with Atree; use Atree;
- with Types; use Types;
- with Sinfo; use Sinfo;
-
-@@ -405,6 +404,9 @@
- function Is_Statement (N : Node_Id) return Boolean;
- -- Checks if N is a statement node.
-
-+ type Paren_Count_Type is mod 4;
-+ for Paren_Count_Type'Size use 2;
-+
- function Parenth_Count
- (N : Node_Id;
- Original_N : Node_Id)
diff -u asis-2007/debian/changelog asis-2007/debian/changelog
--- asis-2007/debian/changelog
+++ asis-2007/debian/changelog
@@ -1,3 +1,12 @@
+asis (2007-2.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Move patches directory to debian/patches and adjust build system
+ accordingly in order to be compatible with the new source format 3.0
+ (quilt). Closes: #485099
+
+ -- Raphael Hertzog <[EMAIL PROTECTED]> Mon, 16 Jun 2008 22:12:38 +0200
+
asis (2007-2) unstable; urgency=low
* Add support for ppc64.
diff -u asis-2007/debian/rules asis-2007/debian/rules
--- asis-2007/debian/rules
+++ asis-2007/debian/rules
@@ -33,12 +33,10 @@
LIBASIS := libasis.so.$(VERSION)
CPUS := $(shell getconf _NPROCESSORS_ONLN)
-patch:
- -quilt push -a
+include /usr/share/quilt/quilt.make
-clean:
+clean: unpatch
dh_testdir
- -quilt pop -a
-rm -f *-stamp
-rm -f obj/libasis*.so* obj/libasis*.a obj/*.ali obj/*.o obj/GNAT*
-rm -rf debian/obj $(TOOLS)
only in patch2:
unchanged:
--- asis-2007.orig/debian/patches/series
+++ asis-2007/debian/patches/series
@@ -0,0 +1,2 @@
+gnatgcc.patch
+gcc-4.3.patch
only in patch2:
unchanged:
--- asis-2007.orig/debian/patches/gcc-4.3.patch
+++ asis-2007/debian/patches/gcc-4.3.patch
@@ -0,0 +1,149 @@
+--- asis-2007.orig/asis/asis-extensions.adb
++++ asis-2007/asis/asis-extensions.adb
+@@ -2079,7 +2079,7 @@ package body Asis.Extensions is
+
+ Result : Boolean := True;
+ -- the idea of the implementation is to find out the cases when
+- -- Expression is NOT a true exception, so we initialize Result
++ -- Expression is NOT a true expression, so we initialize Result
+ -- as True
+ begin
+ Check_Validity (Expression, Package_Name & "Is_True_Expression");
+@@ -2128,7 +2128,7 @@ package body Asis.Extensions is
+ if Nkind (Arg_Node) = N_Selected_Component and then
+ Etype (Arg_Node) = Any_Type
+ -- for now (GNAT 3.05) this means, that Expression is an
+- -- expanded name of the character literal of ether a
++ -- expanded name of the character literal of either a
+ -- predefined character type or of the type derived from a
+ -- predefined character type; the problem is that the
+ -- Entity field is not set for such a node
+@@ -2152,23 +2152,24 @@ package body Asis.Extensions is
+
+ if No (Entity_Node) then
+ Result := False;
+- elsif Ekind (Entity_Node) = E_Enumeration_Literal then
+- null;
+ else
+ case Ekind (Entity_Node) is
+- -- the first choice in this case statement should
+- -- filter in entities which *ARE* expressions in Ada
+- -- sense
++ when E_Component | E_Constant | E_Discriminant |
++ E_Loop_Parameter | E_Out_Parameter =>
++ null;
+ when E_Variable =>
+ -- tasks and protected objects declared by _single_
+ -- task/protected declarations do not have
+ -- corresponding type declarations which can be
+ -- represented in ASIS
+ Result := Comes_From_Source (Parent (Entity_Node));
+- when E_Component .. E_Named_Real |
++ when E_In_Out_Parameter | E_In_Parameter |
++ E_Generic_In_Out_Parameter | E_Generic_In_Parameter |
++ E_Named_Integer | E_Named_Real =>
+ -- variables and constants (including formal
+ -- parameters and generic formal parameters
+- E_Enumeration_Literal | -- ??? (see elsif path)
++ null;
++ when E_Enumeration_Literal |
+ -- enumeration literals are not treated as functions
+ -- in ASIS
+ E_Entry_Index_Parameter |
+--- asis-2007.orig/asis/a4g-mapping.adb
++++ asis-2007/asis/a4g-mapping.adb
+@@ -39,6 +39,8 @@
+
+ with Ada.Characters.Handling; use Ada.Characters.Handling;
+
++with Atree; use Atree; -- from libgnatvsn
++
+ with Asis; use Asis;
+ with Asis.Compilation_Units; use Asis.Compilation_Units;
+ with Asis.Elements; use Asis.Elements;
+@@ -3930,7 +3932,7 @@ package body A4G.Mapping is
+ Original_N : Node_Id)
+ return Paren_Count_Type
+ is
+- Result : Paren_Count_Type := Paren_Count (N);
++ Result : Paren_Count_Type := Paren_Count_Type (Paren_Count (N));
+ begin
+
+ if Result > 0 and then
+--- asis-2007.orig/asis/a4g-gnat_int.adb
++++ asis-2007/asis/a4g-gnat_int.adb
+@@ -206,7 +206,7 @@ package body A4G.GNAT_Int is
+
+ -- GNAT/ASIS version check first
+
+- if Tree_ASIS_Version_Number /= ASIS_Version_Number then
++ if Tree_ASIS_Version_Number /= Tree_IO.ASIS_Version_Number then
+ Close (Desc, File_Closed);
+ Ada.Exceptions.Raise_Exception
+ (Program_Error'Identity, "Inconsistent versions of GNAT and ASIS");
+--- asis-2007.orig/asis/a4g-contt-dp.adb
++++ asis-2007/asis/a4g-contt-dp.adb
+@@ -138,7 +138,7 @@ package body A4G.Contt.Dp is
+ -- If not In_Unit_Id_List (U, L), U is appended to L (if L is null,
+ -- new Unit_Id_List value is created)
+
+- procedure Reorder_Sem_Dependencies (Units : in out Unit_Id_List_Access);
++ procedure Reorder_Sem_Dependencies (Units : in Unit_Id_List_Access);
+ -- This procedure takes the unit list with is supposed to be the result of
+ -- one of the Set_All_<Relation> functions above (that is, its parameter
+ -- is not supposed to be null and it contains only existing units). It
+@@ -496,7 +496,7 @@ package body A4G.Contt.Dp is
+ -- Reorder_Sem_Dependencies --
+ ------------------------------
+
+- procedure Reorder_Sem_Dependencies (Units : in out Unit_Id_List_Access) is
++ procedure Reorder_Sem_Dependencies (Units : in Unit_Id_List_Access) is
+ More_Inversion : Boolean := True;
+ Tmp_Unit : Unit_Id;
+ begin
+--- asis-2007.orig/asis/a4g-a_elists.adb
++++ asis-2007/asis/a4g-a_elists.adb
+@@ -287,7 +287,7 @@ package body A4G.A_Elists is
+ ---------------
+
+ procedure Move_List
+- (List_From : in out Elist_Id;
++ (List_From : in Elist_Id;
+ List_To : in out Elist_Id)
+ is
+ begin
+--- asis-2007.orig/asis/a4g-a_elists.ads
++++ asis-2007/asis/a4g-a_elists.ads
+@@ -203,10 +203,10 @@ package A4G.A_Elists is
+ -- equial to No_List, returns True
+
+ procedure Move_List
+- (List_From : in out Elist_Id;
++ (List_From : in Elist_Id;
+ List_To : in out Elist_Id);
+ -- Moves (prepends) the content of List_From to List_To. If List_To is
+- -- equial to No_Elist, it is created. For now, this procedure does not
++ -- equal to No_Elist, it is created. For now, this procedure does not
+ -- check if the elements from List_From are already in List_To, therefore
+ -- as a result of a call to this procedure, List_To can contain
+ -- duplicated elements
+--- asis-2007.orig/asis/a4g-mapping.ads
++++ asis-2007/asis/a4g-mapping.ads
+@@ -64,7 +64,6 @@ with Asis;
+ with A4G.A_Types; use A4G.A_Types;
+ with A4G.Int_Knds; use A4G.Int_Knds;
+
+-with Atree; use Atree;
+ with Types; use Types;
+ with Sinfo; use Sinfo;
+
+@@ -405,6 +404,9 @@ package A4G.Mapping is
+ function Is_Statement (N : Node_Id) return Boolean;
+ -- Checks if N is a statement node.
+
++ type Paren_Count_Type is mod 4;
++ for Paren_Count_Type'Size use 2;
++
+ function Parenth_Count
+ (N : Node_Id;
+ Original_N : Node_Id)
only in patch2:
unchanged:
--- asis-2007.orig/debian/patches/gnatgcc.patch
+++ asis-2007/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-2007.orig/asis/a4g-gnat_int.adb
++++ asis-2007/asis/a4g-gnat_int.adb
+@@ -72,7 +72,7 @@ package body A4G.GNAT_Int is
+
+ 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 --
