1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
Change input file format to allow space separated lists,
like LDLIBS=-lfoo -lbar.
The change will cause FTBFS for reverse dependencies.
It should wait the switch to 4.8,
as all packages will need a rebuild anyhow.
============================================================
--- man/dh_ada_library.1 14faa9ba0eaf436fd697827bf9b750c530f08e85
+++ man/dh_ada_library.1 029979dfff000524adbad02b2c26ee049e3f3bcc
@@ -180,9 +180,8 @@ Projects and variables, in addition to t
.I debian/ada_libraries
Projects and variables, in addition to those in the command line.
.\"
-Line breaks are considered as normal spaces.
-.\"
-Any line starting with a dash will be ignored.
+Each line is considered as a new command line argument, with the
+exception that lines starting with a dash or empty will be ignored.
.\"----------------------------------------------------------------------
.SH OPTIONS
Common debhelper command line options and environment variables are
============================================================
--- man/dh_ada_library.fr.1 87a611c5d3b2277518dfac0577abd4ea43a9c30e
+++ man/dh_ada_library.fr.1 9ae285dca8610fbd32ebab4f4847f85274e60c8c
@@ -194,9 +194,9 @@ commande.
Projets et variables à traiter en plus de ceux mentionnés en ligne de
commande.
.\"
-Les fins de ligne sont considérés comme de simples espaces.
-.\"
-Toute ligne débutant par un dièse est ignorée.
+Chaque ligne est traitée comme un nouvel argument en ligne de
+commande, à l’exception près que les lignes vides ou débutant par un
+dièse sont ignorées.
.\"----------------------------------------------------------------------
.SH OPTIONS
Les options en ligne de commande et variables d’environnement communes
============================================================
--- src/dh_ada_library.adb 82f37b62ae695c41d68f2a000d55363bd212f7b2
+++ src/dh_ada_library.adb 756ca301b813669bfe805812958b5e6f463ae848
@@ -18,7 +18,6 @@ with Ada.Strings.Fixed;
with Ada.Containers.Indefinite_Vectors;
with Ada.Directories;
with Ada.Strings.Fixed;
-with Ada.Strings.Maps;
with Ada.Text_IO;
with GNAT.OS_Lib;
@@ -59,8 +58,6 @@ procedure Dh_Ada_Library is
:= "(generated by " & Ada.Command_Line.Command_Name
& " during package build)";
- Space_Character_Set : constant Ada.Strings.Maps.Character_Set
- := Ada.Strings.Maps.To_Set (' ');
Configuration_File : constant String := "debian/ada_libraries";
Src_Install_Dir : constant String := "usr/share/ada/adainclude/";
@@ -784,30 +781,14 @@ procedure Dh_Ada_Library is
end Process_Argument;
procedure Process_Line (Buffer : in String) is
- use Ada.Strings.Fixed;
- First : Natural;
- Last : Natural := Buffer'First - 1;
Recognized : Boolean;
begin
if Buffer'Length > 0 and then Buffer (Buffer'First) /= '#' then
- while Last < Buffer'Last loop
- First := Index (Buffer, Space_Character_Set, Last + 1,
- Ada.Strings.Outside);
- exit when First = 0;
- Last := Index (Buffer, Space_Character_Set, First,
- Ada.Strings.Inside);
- if Last = 0 then
- Last := Buffer'Last;
- else
- Last := Last - 1;
- end if;
- Process_Argument (Buffer (First .. Last), Recognized);
- if not Recognized then
- raise Usage_Error
- with Configuration_File & ": unrecognized argument "
- & Buffer (First .. Last);
- end if;
- end loop;
+ Process_Argument (Buffer, Recognized);
+ if not Recognized then
+ raise Usage_Error
+ with Configuration_File & ": unrecognized argument " & Buffer;
+ end if;
end if;
end Process_Line;
|
