The unified diff between revisions [ab242a05..] and [93e3a3a4..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch ".mtn-ignore"
# from [49753bd1a8300d3600834f1f3a869d24ad9b3167]
# to [21e8b7366f6d9e108990ef8f5942603c97b37210]
#
# patch "debian/README.source"
# from [2788a29c2e22a6d8fca1553a588059915c8a9e62]
# to [be34069eefe0404e3cf70c204c933bcdd28c865c]
#
# patch "debian/bug_571013.gpr"
# from [467c50aed9f18a085d3770fe15034701a95e734a]
# to [f54e5478597ca9300f54e3b8714be55df8586d8b]
#
# patch "debian/changelog"
# from [aa01126d6aaf66acdd63602081e467de603f2687]
# to [cea2c24dea59a9e9357ab06987cae9be37a67e43]
#
# patch "debian/patches/compilers.patch"
# from [ecbd3b7f843e1dd680ad943f7abc20e1f2fbbffc]
# to [db92851bedcca4e7624cb56d8272377eeb7f3730]
#
# patch "debian/patches/default_path.patch"
# from [4d9f3a9e0389267a0128cfd7a26f5a5b48d83af0]
# to [31bddbb68eef095883a23c7e0513d827314c63fa]
#
# patch "debian/patches/remove_rpath.patch"
# from [7a604e6f571844b432ed5a9c04043cd1f8b937d3]
# to [85f9b346fcd3b9a8b3aa76e87a06820e18e5de15]
#
# patch "debian/patches/version.patch"
# from [ecb23a196b63c141df6f9700e83e62de33bb202b]
# to [8a4f5bf758f8b6f65826148a18a7114009c6338c]
#
# patch "debian/test_installed.sh"
# from [c58ee9339dd92b8921e1645e17160232e626e41b]
# to [11815932c1367db2e97d2a8573c54ebde186a904]
#
============================================================
--- .mtn-ignore 49753bd1a8300d3600834f1f3a869d24ad9b3167
+++ .mtn-ignore 21e8b7366f6d9e108990ef8f5942603c97b37210
@@ -1,9 +1,11 @@
^.*\.log$
^.*\.substvars$
^CHANGE_124901$
+^CHANGE_143156$
^COPYING$
^Makefile\.in$
^README$
+^\.gitignore$
^\.pc$
^build-stamp$
^config\.guess$
@@ -19,8 +21,10 @@
^doc$
^doinstall$
^examples$
+^features$
^features-11$
^features-12$
+^features-13$
^files$
^gnat$
^gprbuild$
@@ -29,6 +33,7 @@
^install-sh$
^known-problems-100$
^known-problems-110$
+^known-problems-120$
^obj$
^obj-cov$
^obj-debug$
============================================================
--- debian/README.source 2788a29c2e22a6d8fca1553a588059915c8a9e62
+++ debian/README.source be34069eefe0404e3cf70c204c933bcdd28c865c
@@ -1,19 +1,30 @@
-The upstream repository has a "working" version of gprbuild; 1.2.0w.
+The upstream repository is https://libre.adacore.com/libre/download/.
+gprbuild 1.3.0 is packaged with GNAT GPL 2009, in the sources folder.
+
It contains part of the GNAT compiler sources in the gnat directory.
-The code in gnat duplicates the code in libgnatprj and libgnatvsn.
-However, the versions are different enough that we cannot make
-gprbuild work with the libraries, so we use the included source.
+The code in gnat duplicates the code in the Debian libraries
+libgnatprj and libgnatvsn. However, the versions are different enough
+that we cannot make gprbuild work with the Debian libraries, so we use
+the included source.
We have to rename the root directory in the tarball to meet the dpkg
-naming convention:
+naming convention. In addition, there are some files marked executable
+in the upstream tarball that should not be. To prepare a new build
+directory:
cd /home/Projects/gprbuild
- tar zxf ~/Downloads/gprbuild-gpl-1.2.0-src.tgz
- mv gprbuild-1.2.0w-src gprbuild-1.2.0
- mkdir gprbuild-1.2.0-current
- tar zcf gprbuild-1.2.0-current/gprbuild-1.2.0.orig.tar.gz gprbuild-1.2.0
+ tar zxf ~/Downloads/gprbuild-gpl-1.3.0-src.tgz
+ mv gprbuild-1.3.0w-src gprbuild-1.3.0
+ chmod -x gprbuild-1.3.0/examples/first_steps/util_src/lib.h
+ chmod -x gprbuild-1.3.0/examples/subsystems/util_src/lib.h
+ chmod -x gprbuild-1.3.0/examples/namings/*
+ chmod -x gprbuild-1.3.0/examples/libraries/lib_src/lib.h
+ mkdir gprbuild-1.3.0-current
+ tar zcf gprbuild-1.3.0-current/gprbuild_1.3.0.orig.tar.gz gprbuild-1.3.0
+ cd gprbuild-1.3.0-current
+ mtn --db ~/monotone-dbs/ada-france.db checkout --branch org.debian.gprbuild gprbuild-1.3.0
+ tar zxf gprbuild_1.3.0.orig.tar.gz
-
There are regular expressions in share/gprconfig/compilers.xml that
must match the version string output by 'gcc'; we patch (via quilt;
see /usr/share/doc/quilt/README.source) these to allow "Debian" in the
============================================================
--- debian/bug_571013.gpr 467c50aed9f18a085d3770fe15034701a95e734a
+++ debian/bug_571013.gpr f54e5478597ca9300f54e3b8714be55df8586d8b
@@ -1,10 +1,13 @@ project Bug_571013 is
with "gtkada2";
project Bug_571013 is
- for Main use ("bug_571013.adb");
- package Builder is
- for Default_Switches ("Ada") use
- (
- "-s" -- recompile if flags changed
- );
- end Builder;
+ for Object_Dir use "tmp/obj";
+ for Exec_Dir use "tmp";
+
+ for Main use ("bug_571013.adb");
+ package Builder is
+ for Default_Switches ("Ada") use
+ (
+ "-s" -- recompile if flags changed
+ );
+ end Builder;
end Bug_571013;
============================================================
--- debian/changelog aa01126d6aaf66acdd63602081e467de603f2687
+++ debian/changelog cea2c24dea59a9e9357ab06987cae9be37a67e43
@@ -1,9 +1,14 @@
-gprbuild (1.2.0-5) unstable; urgency=low
+gprbuild (1.3.0-1) unstable; urgency=low
- * debian/control (Architecture): change to any for bug #568437
+ * update to new upstream version. (Closes: #571013)
- -- Stephen Leake <stephen_leake@stephe-leake.org> Sun, 28 Feb 2010 08:02:29 -0500
+ * debian/README.source, debian/patch/*.patch: update for upstream 1.3.0
+ (Closes: #571013)
+ * debian/control (Architecture): change to any. (Closes: #568437)
+
+ -- Stephen Leake <stephen_leake@stephe-leake.org> Sun, 07 Mar 2010 10:10:50 -0500
+
gprbuild (1.2.0-4) unstable; urgency=low
* control (Standards-Version): bump to 3.8.4
============================================================
--- debian/patches/compilers.patch ecbd3b7f843e1dd680ad943f7abc20e1f2fbbffc
+++ debian/patches/compilers.patch db92851bedcca4e7624cb56d8272377eeb7f3730
@@ -1,25 +1,27 @@
-regular expressions in share/gprconfig/compilers.xml that must match
+Regular expressions in share/gprconfig/compilers.xml that must match
the version string output by 'gcc'; we patch these to allow "Debian"
in the string.
-Also, linker.xml and gnat.xml expect gprlib and gprbind in
-/usr/libexec; we put them in /usr/lib
+Change linker.xml and gnat.xml to find gprlib and gprbind in /usr/lib
-Index: gprbuild-1.2.0/share/gprconfig/compilers.xml
+Ensure we use gcc-4.4 explicitly, so gpbuild does not depend
+on which top-level gcc is installed.
+
+Index: gprbuild-1.3.0/share/gprconfig/compilers.xml
===================================================================
---- gprbuild-1.2.0.orig/share/gprconfig/compilers.xml 2010-01-20 04:44:13.000000000 -0500
-+++ gprbuild-1.2.0/share/gprconfig/compilers.xml 2010-01-20 04:45:31.000000000 -0500
+--- gprbuild-1.3.0.orig/share/gprconfig/compilers.xml 2009-04-22 09:41:49.000000000 -0400
++++ gprbuild-1.3.0/share/gprconfig/compilers.xml 2010-03-03 07:32:56.000000000 -0500
@@ -9,14 +9,14 @@
<!-- GCC 3.x & 4.x -->
<compiler_description>
<name>GCC</name>
-- <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-).*)?gcc</executable>
-+ <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-).*)?gcc-4.4</executable>
+- <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-|-elinos-linux).*)?gcc</executable>
++ <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-|-elinos-linux).*)?gcc-4.4</executable>
<version>
-- <external>${PREFIX}gcc --version</external>
-- <grep regexp="\(GCC\) (\S+)" group="1"></grep>
-+ <external>${PREFIX}gcc-4.4 --version</external>
-+ <grep regexp="^gcc-4.4 (.+)" group="1"></grep>
+- <external>${PREFIX}gcc -v</external>
+- <grep regexp="^gcc version (\S+)" group="1"></grep>
++ <external>${PREFIX}gcc-4.4 -dumpversion</external>
++ <grep regexp=".+"></grep>
</version>
<languages>C</languages>
<target>
@@ -28,17 +30,14 @@ Index: gprbuild-1.2.0/share/gprconfig/co
<grep regexp="[^\r\n]+"></grep>
</target>
</compiler_description>
-@@ -94,14 +94,14 @@
- <!-- G++ compilers -->
- <compiler_description>
+@@ -96,12 +96,12 @@
<name>G++</name>
-- <executable>g++</executable>
-+ <executable>g++-4.4</executable>
+ <executable>g++</executable>
<version>
-- <external>g++ --version</external>
-- <grep regexp="\(GCC\) (\S+)" group="1"></grep>
-+ <external>g++-4.4 --version</external>
-+ <grep regexp="^g\+\+-4.4 (.+)" group="1"></grep>
+- <external>g++ -v</external>
+- <grep regexp="^gcc version (\S+)" group="1"></grep>
++ <external>g++-4.4 -dumpversion</external>
++ <grep regexp=".+"></grep>
</version>
<languages>C++</languages>
<target>
@@ -51,13 +50,13 @@ Index: gprbuild-1.2.0/share/gprconfig/co
<!-- Assembler -->
<compiler_description>
<name>GCC-ASM</name>
-- <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-).*)?gcc</executable>
-+ <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-).*)?gcc-4.4</executable>
+- <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-|elinos-linux).*)?gcc</executable>
++ <executable prefix="1">(.*(-wrs-|-elf-|-eabispe-|avr-|elinos-linux).*)?gcc-4.4</executable>
<version>
-- <external>${PREFIX}gcc --version</external>
-- <grep regexp="\(GCC\) (\S+)" group="1"></grep>
-+ <external>${PREFIX}gcc-4.4 --version</external>
-+ <grep regexp="^gcc (.+)" group="1"></grep>
+- <external>${PREFIX}gcc -v</external>
+- <grep regexp="^gcc version (\S+)" group="1"></grep>
++ <external>${PREFIX}gcc-4.4 -dumpversion</external>
++ <grep regexp=".+"></grep>
</version>
<languages>Asm,Asm_Cpp,Asm2</languages>
<target>
@@ -66,15 +65,17 @@ Index: gprbuild-1.2.0/share/gprconfig/co
<grep regexp="[^\r\n]+"></grep>
</target>
</compiler_description>
-@@ -155,7 +155,7 @@
+@@ -155,8 +155,8 @@
<grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
</version>
<variable name="gcc_version">
- <external>${PREFIX}gcc -v</external>
-+ <external>${PREFIX}gcc-4.4 -v</external>
- <grep regexp="^gcc version (\S+)" group="1"></grep>
+- <grep regexp="^gcc version (\S+)" group="1"></grep>
++ <external>${PREFIX}gcc-4.4 -dumpversion</external>
++ <grep regexp=".+"></grep>
</variable>
<languages>Ada</languages>
+ <runtimes default="default,kernel">
@@ -164,7 +164,7 @@
<directory group="2" >\.\./lib/gcc(-lib)?/$TARGET/$gcc_version/rts-(.*)/adalib/</directory>
</runtimes>
@@ -84,30 +85,11 @@ Index: gprbuild-1.2.0/share/gprconfig/co
<grep regexp="[^\r\n]+"></grep>
</target>
</compiler_description>
-@@ -187,14 +187,14 @@
- <!-- GFortran -->
- <compiler_description>
- <name>GFORTRAN</name>
-- <executable>gfortran</executable>
-+ <executable>gfortran-4.4</executable>
- <version>
-- <external>gfortran --version</external>
-- <grep regexp="\(GCC\) (\S+)" group="1"></grep>
-+ <external>gfortran-4.4 --version</external>
-+ <grep regexp="^GNU Fortran (.+)" group="1"></grep>
- </version>
- <languages>Fortran</languages>
- <target>
-- <external>gfortran -dumpmachine</external>
-+ <external>gfortran-4.4 -dumpmachine</external>
- <grep regexp="[^\r\n]+"></grep>
- </target>
- </compiler_description>
-Index: gprbuild-1.2.0/share/gprconfig/linker.xml
+Index: gprbuild-1.3.0/share/gprconfig/linker.xml
===================================================================
---- gprbuild-1.2.0.orig/share/gprconfig/linker.xml 2010-01-20 04:44:13.000000000 -0500
-+++ gprbuild-1.2.0/share/gprconfig/linker.xml 2010-01-20 04:45:04.000000000 -0500
-@@ -133,7 +133,7 @@
+--- gprbuild-1.3.0.orig/share/gprconfig/linker.xml 2009-03-20 06:47:26.000000000 -0400
++++ gprbuild-1.3.0/share/gprconfig/linker.xml 2010-03-03 07:19:37.000000000 -0500
+@@ -166,7 +166,7 @@
</targets>
<config>
for Library_Support use "static_only";
@@ -115,9 +97,9 @@ Index: gprbuild-1.2.0/share/gprconfig/li
+ for Library_Builder use "${GPRCONFIG_PREFIX}/lib/gprlib";
</config>
</configuration>
-
-@@ -143,7 +143,7 @@
- <target name=".*darwin.*" />
+
+@@ -176,7 +176,7 @@
+ <target name="^.*darwin.*$" />
</targets>
<config>
- for Library_Builder use "${GPRCONFIG_PREFIX}/libexec/gprbuild/gprlib";
@@ -125,8 +107,8 @@ Index: gprbuild-1.2.0/share/gprconfig/li
for Library_Support use "full";
for Shared_Library_Prefix use "lib";
for Symbolic_Link_Supported use "true";
-@@ -162,7 +162,7 @@
- <target name=".*hpux.*" />
+@@ -198,7 +198,7 @@
+ <target name="^.*hpux.*$" />
</targets>
<config>
- for Library_Builder use "${GPRCONFIG_PREFIX}/libexec/gprbuild/gprlib";
@@ -134,8 +116,8 @@ Index: gprbuild-1.2.0/share/gprconfig/li
for Library_Support use "full";
for Shared_Library_Prefix use "lib";
for Symbolic_Link_Supported use "true";
-@@ -182,7 +182,7 @@
- <target name=".*irix.*" />
+@@ -236,7 +236,7 @@
+ <target name="^.*irix.*$" />
</targets>
<config>
- for Library_Builder use "${GPRCONFIG_PREFIX}/libexec/gprbuild/gprlib";
@@ -143,8 +125,8 @@ Index: gprbuild-1.2.0/share/gprconfig/li
for Library_Support use "full";
for Shared_Library_Prefix use "lib";
for Symbolic_Link_Supported use "true";
-@@ -214,7 +214,7 @@
- <target name=".*solaris.*"/>
+@@ -299,7 +299,7 @@
+ <target name="^.*solaris.*$"/>
</targets>
<config>
- for Library_Builder use "${GPRCONFIG_PREFIX}/libexec/gprbuild/gprlib";
@@ -152,8 +134,8 @@ Index: gprbuild-1.2.0/share/gprconfig/li
for Library_Support use "full";
for Shared_Library_Prefix use "lib";
for Symbolic_Link_Supported use "true";
-@@ -236,7 +236,7 @@
- <target name=".*mingw.*" />
+@@ -321,7 +321,7 @@
+ <target name="^.*mingw.*$" />
</targets>
<config>
- for Library_Builder use "${GPRCONFIG_PREFIX}/libexec/gprbuild/gprlib";
@@ -161,8 +143,8 @@ Index: gprbuild-1.2.0/share/gprconfig/li
for Library_Support use "full";
for Shared_Library_Prefix use "lib";
for Symbolic_Link_Supported use "false";
-@@ -254,7 +254,7 @@
- <target name=".*osf.*" />
+@@ -345,7 +345,7 @@
+ <target name="^.*osf.*$" />
</targets>
<config>
- for Library_Builder use "${GPRCONFIG_PREFIX}/libexec/gprbuild/gprlib";
@@ -170,7 +152,7 @@ Index: gprbuild-1.2.0/share/gprconfig/li
for Library_Support use "full";
for Shared_Library_Prefix use "lib";
for Symbolic_Link_Supported use "true";
-@@ -276,7 +276,7 @@
+@@ -373,7 +373,7 @@
</targets>
<compilers><compiler name="GNAT" /></compilers>
<config>
@@ -179,32 +161,32 @@ Index: gprbuild-1.2.0/share/gprconfig/li
for Library_Support use "full";
for Shared_Library_Prefix use "lib";
for Shared_Library_Suffix use ".exe";
-Index: gprbuild-1.2.0/share/gprconfig/gnat.xml
+Index: gprbuild-1.3.0/share/gprconfig/gnat.xml
===================================================================
---- gprbuild-1.2.0.orig/share/gprconfig/gnat.xml 2010-01-20 04:44:13.000000000 -0500
-+++ gprbuild-1.2.0/share/gprconfig/gnat.xml 2010-01-20 04:45:04.000000000 -0500
-@@ -20,7 +20,7 @@
+--- gprbuild-1.3.0.orig/share/gprconfig/gnat.xml 2009-03-20 06:47:26.000000000 -0400
++++ gprbuild-1.3.0/share/gprconfig/gnat.xml 2010-03-03 07:32:56.000000000 -0500
+@@ -16,7 +16,7 @@
end Naming;
-
+
package Compiler is
- for Driver ("Ada") use "${PATH}${PREFIX}gcc";
+ for Driver ("Ada") use "${PATH}${PREFIX}gcc-4.4";
- for Required_Switches ("Ada") use
- Compiler'Required_Switches ("Ada")
+ for Leading_Required_Switches ("Ada") use
+ Compiler'Leading_Required_Switches ("Ada")
& ("-c", "-x", "ada", "-gnatA");
-@@ -36,7 +36,7 @@
+@@ -32,7 +32,7 @@
for Required_Switches ("Ada") use
Binder'Required_Switches ("Ada") & ("-I-");
for Driver ("Ada") use
- "${GPRCONFIG_PREFIX}/libexec/gprbuild/gprbind";
+ "${GPRCONFIG_PREFIX}/lib/gprbind";
end Binder;
-
- package Linker is
-Index: gprbuild-1.2.0/share/gprconfig/cpp.xml
+
+ for Toolchain_Version ("Ada") use "GNAT ${VERSION}";
+Index: gprbuild-1.3.0/share/gprconfig/cpp.xml
===================================================================
---- gprbuild-1.2.0.orig/share/gprconfig/cpp.xml 2010-01-20 04:44:13.000000000 -0500
-+++ gprbuild-1.2.0/share/gprconfig/cpp.xml 2010-01-20 04:45:04.000000000 -0500
+--- gprbuild-1.3.0.orig/share/gprconfig/cpp.xml 2009-03-17 17:53:19.000000000 -0400
++++ gprbuild-1.3.0/share/gprconfig/cpp.xml 2010-03-03 07:19:37.000000000 -0500
@@ -24,7 +24,7 @@
</compilers>
<config>
@@ -214,54 +196,54 @@ Index: gprbuild-1.2.0/share/gprconfig/cp
end Compiler;
</config>
</configuration>
-Index: gprbuild-1.2.0/share/gprconfig/fortran.xml
+Index: gprbuild-1.3.0/share/gprconfig/fortran.xml
===================================================================
---- gprbuild-1.2.0.orig/share/gprconfig/fortran.xml 2010-01-20 04:44:13.000000000 -0500
-+++ gprbuild-1.2.0/share/gprconfig/fortran.xml 2010-01-20 04:45:04.000000000 -0500
+--- gprbuild-1.3.0.orig/share/gprconfig/fortran.xml 2009-03-17 17:53:19.000000000 -0400
++++ gprbuild-1.3.0/share/gprconfig/fortran.xml 2010-03-03 07:32:56.000000000 -0500
@@ -50,7 +50,7 @@
end Naming;
-
+
package Compiler is
- for Driver ("Fortran") use "${PATH}gfortran${PREFIX}";
+ for Driver ("Fortran") use "${PATH}gfortran-4.4${PREFIX}";
- for Required_Switches ("Fortran") use
- Compiler'Required_Switches ("Fortran") &
+ for Leading_Required_Switches ("Fortran") use
+ Compiler'Leading_Required_Switches ("Fortran") &
("-c", "-fno-underscoring");
-Index: gprbuild-1.2.0/share/gprconfig/asm.xml
+Index: gprbuild-1.3.0/share/gprconfig/asm.xml
===================================================================
---- gprbuild-1.2.0.orig/share/gprconfig/asm.xml 2010-01-20 04:44:13.000000000 -0500
-+++ gprbuild-1.2.0/share/gprconfig/asm.xml 2010-01-20 04:45:04.000000000 -0500
+--- gprbuild-1.3.0.orig/share/gprconfig/asm.xml 2009-03-17 17:53:19.000000000 -0400
++++ gprbuild-1.3.0/share/gprconfig/asm.xml 2010-03-03 07:34:01.000000000 -0500
@@ -13,7 +13,7 @@
end Naming;
-
+
package Compiler is
- for Driver ("Asm_Cpp") use "${PATH}${PREFIX}gcc";
+ for Driver ("Asm_Cpp") use "${PATH}${PREFIX}gcc-4.4";
- for Required_Switches ("Asm_Cpp") use
- Compiler'Required_Switches ("Asm_Cpp") &
+ for Leading_Required_Switches ("Asm_Cpp") use
+ Compiler'Leading_Required_Switches ("Asm_Cpp") &
("-c", "-x", "assembler-with-cpp");
@@ -33,7 +33,7 @@
end Naming;
-
+
package Compiler is
- for Driver ("Asm") use "${PATH}${PREFIX}gcc";
+ for Driver ("Asm") use "${PATH}${PREFIX}gcc-4.4";
- for Required_Switches ("Asm") use
- Compiler'Required_Switches ("Asm") &
+ for Leading_Required_Switches ("Asm") use
+ Compiler'Leading_Required_Switches ("Asm") &
("-c", "-x", "assembler");
@@ -53,7 +53,7 @@
end Naming;
-
+
package Compiler is
- for Driver ("Asm2") use "${PATH}${PREFIX}gcc";
+ for Driver ("Asm2") use "${PATH}${PREFIX}gcc-4.4";
- for Required_Switches ("Asm2") use
- Compiler'Required_Switches ("Asm2") &
+ for Leading_Required_Switches ("Asm2") use
+ Compiler'Leading_Required_Switches ("Asm2") &
("-c", "-x", "assembler");
-Index: gprbuild-1.2.0/share/gprconfig/c.xml
+Index: gprbuild-1.3.0/share/gprconfig/c.xml
===================================================================
---- gprbuild-1.2.0.orig/share/gprconfig/c.xml 2010-01-20 04:44:13.000000000 -0500
-+++ gprbuild-1.2.0/share/gprconfig/c.xml 2010-01-20 04:45:04.000000000 -0500
+--- gprbuild-1.3.0.orig/share/gprconfig/c.xml 2009-03-17 17:53:19.000000000 -0400
++++ gprbuild-1.3.0/share/gprconfig/c.xml 2010-03-03 07:19:37.000000000 -0500
@@ -23,7 +23,7 @@
</compilers>
<config>
============================================================
--- debian/patches/default_path.patch 4d9f3a9e0389267a0128cfd7a26f5a5b48d83af0
+++ debian/patches/default_path.patch 31bddbb68eef095883a23c7e0513d827314c63fa
@@ -1,19 +1,21 @@
-Index: gprbuild-1.2.0/gnat/prj-ext.adb
+# set default project path to match Debian Ada policy
+
+Index: gprbuild-1.3.0/gnat/prj-ext.adb
===================================================================
---- gprbuild-1.2.0.orig/gnat/prj-ext.adb 2010-01-31 05:13:24.000000000 -0500
-+++ gprbuild-1.2.0/gnat/prj-ext.adb 2010-01-31 05:14:21.000000000 -0500
+--- gprbuild-1.3.0.orig/gnat/prj-ext.adb 2010-03-03 07:18:03.000000000 -0500
++++ gprbuild-1.3.0/gnat/prj-ext.adb 2010-03-03 07:18:25.000000000 -0500
@@ -24,7 +24,6 @@
------------------------------------------------------------------------------
-
+
with Hostparm;
-with Makeutl; use Makeutl;
with Output; use Output;
with Osint; use Osint;
with Sdefault;
-@@ -252,36 +251,10 @@
-
+@@ -252,37 +251,10 @@
+
-- Set the initial value of Current_Project_Path
-
+
- if Add_Default_Dir then
- declare
- Prefix : String_Ptr := Sdefault.Search_Dir_Prefix;
@@ -25,8 +27,7 @@ Index: gprbuild-1.2.0/gnat/prj-ext.adb
- if Get_Mode = Multi_Language then
- Add_Str_To_Name_Buffer
- (Path_Separator & Prefix.all &
-- Directory_Separator & "share" &
-- Directory_Separator & "gpr");
+- "share" & Directory_Separator & "gpr");
- end if;
-
- Add_Str_To_Name_Buffer
@@ -43,11 +44,13 @@ Index: gprbuild-1.2.0/gnat/prj-ext.adb
- ".." & Directory_Separator &
- ".." & Directory_Separator & "gnat");
- end if;
+-
+- Free (Prefix);
- end;
+ if Add_Default_Dir and Sdefault.Search_Dir_Prefix /= null then
+ Current_Project_Path :=
+ new String'(Name_Buffer (1 .. Name_Len) & Path_Separator &
+ Sdefault.Search_Dir_Prefix.all);
end if;
-
+
if Current_Project_Path = null then
============================================================
--- debian/patches/remove_rpath.patch 7a604e6f571844b432ed5a9c04043cd1f8b937d3
+++ debian/patches/remove_rpath.patch 85f9b346fcd3b9a8b3aa76e87a06820e18e5de15
@@ -1,16 +1,16 @@ See http://wiki.debian.org/RpathIssue.
Avoid rpath on Debian, at least in default configuration.
See http://wiki.debian.org/RpathIssue.
-Index: b/share/gprconfig/linker.xml
+Index: gprbuild-1.3.0/share/gprconfig/linker.xml
===================================================================
---- a/share/gprconfig/linker.xml 2010-02-13 20:20:25.000000000 +0100
-+++ b/share/gprconfig/linker.xml 2010-02-13 20:20:33.000000000 +0100
-@@ -192,7 +192,7 @@
-
+--- gprbuild-1.3.0.orig/share/gprconfig/linker.xml 2010-03-03 07:19:37.000000000 -0500
++++ gprbuild-1.3.0/share/gprconfig/linker.xml 2010-03-03 07:36:53.000000000 -0500
+@@ -246,7 +246,7 @@
+
for Shared_Library_Suffix use ".so";
for Library_Auto_Init_Supported use "true";
- for Run_Path_Option use ("-Wl,-rpath,");
+ for Run_Path_Option use ();
</config>
</configuration>
-
+
============================================================
--- debian/patches/version.patch ecb23a196b63c141df6f9700e83e62de33bb202b
+++ debian/patches/version.patch 8a4f5bf758f8b6f65826148a18a7114009c6338c
@@ -1,34 +1,30 @@
-Index: gprbuild-1.2.0/src/gpr_version.ads
+# patch version string to indicate Debian upload
+
+# patch Build_Type to FSF, since that affects copyright, bug report,
+# and warranty notices.
+
+Index: gprbuild-1.3.0/src/gpr_version.ads
===================================================================
---- gprbuild-1.2.0.orig/src/gpr_version.ads 2010-02-28 05:15:35.000000000 -0500
-+++ gprbuild-1.2.0/src/gpr_version.ads 2010-02-28 08:16:53.000000000 -0500
-@@ -37,7 +37,7 @@
+--- gprbuild-1.3.0.orig/src/gpr_version.ads 2009-04-22 11:03:57.000000000 -0400
++++ gprbuild-1.3.0/src/gpr_version.ads 2010-03-03 07:04:48.000000000 -0500
+@@ -36,7 +36,7 @@
package GPR_Version is
-- Gpr_Version : constant String := "1.2.0w";
-+ Gpr_Version : constant String := "1.2.0w (Debian 1.2.0-5)";
+- Gpr_Version : constant String := "1.3.0";
++ Gpr_Version : constant String := "1.3.0 (Debian 1.3.0-1)";
-- Static string identifying this version
function Gpr_Version_String return String;
-Index: gprbuild-1.2.0/gnat/gnatvsn.ads
+Index: gprbuild-1.3.0/gnat/gnatvsn.ads
===================================================================
---- gprbuild-1.2.0.orig/gnat/gnatvsn.ads 2010-02-28 08:15:12.000000000 -0500
-+++ gprbuild-1.2.0/gnat/gnatvsn.ads 2010-02-28 08:15:40.000000000 -0500
-@@ -37,7 +37,7 @@
-
- package Gnatvsn is
-
-- Gnat_Static_Version_String : constant String := "2008 (20080521)";
-+ Gnat_Static_Version_String : constant String := "2008 (Debian 1.2.0-5)";
- -- Static string identifying this version, that can be used as an argument
- -- to e.g. pragma Ident.
- --
-@@ -54,7 +54,7 @@
+--- gprbuild-1.3.0.orig/gnat/gnatvsn.ads 2009-04-21 21:00:08.000000000 -0400
++++ gprbuild-1.3.0/gnat/gnatvsn.ads 2010-03-03 07:09:00.000000000 -0500
+@@ -53,7 +53,7 @@
type Gnat_Build_Type is (Gnatpro, FSF, GPL);
-- See Get_Gnat_Build_Type below for the meaning of these values
-- Build_Type : constant Gnat_Build_Type := GPL;
+- Build_Type : constant Gnat_Build_Type := Gnatpro;
+ Build_Type : constant Gnat_Build_Type := FSF;
-- Kind of GNAT Build:
--
============================================================
--- debian/test_installed.sh c58ee9339dd92b8921e1645e17160232e626e41b
+++ debian/test_installed.sh 11815932c1367db2e97d2a8573c54ebde186a904
@@ -8,8 +8,8 @@
# sudo schroot ./test_installed.sh
# This re-installs the latest version.
-dpkg --install ../../gprbuild_1.2.0-4_i386.deb
-dpkg --install ../../gprbuild-doc_1.2.0-4_all.deb
+dpkg --install ../../gprbuild_1.3.0-1_i386.deb
+dpkg --install ../../gprbuild-doc_1.3.0-1_all.deb
cd ../examples
make
@@ -30,4 +30,8 @@ gprclean -P aunit_example
gprbuild -P aunit_example
gprclean -P aunit_example
+# test that -s (check switches) doesn't attempt to write in system directories
+# FIXME: need to run this as non-root
+gprbuild bug_571013.gpr
+
# end of file