The unified diff between revisions [4774ecdd..] and [3aee047c..] is displayed below. It can also be downloaded as a raw diff.
#
#
# add_dir "debian/source"
#
# add_file "debian/source/format"
# content [1064dc0ce263680c076a1005f35ec906a5cf5a32]
#
# patch "debian/README.source"
# from [be34069eefe0404e3cf70c204c933bcdd28c865c]
# to [ff17c8267bbdb899005cf6a7e090c4c3505cb384]
#
# patch "debian/changelog"
# from [cea2c24dea59a9e9357ab06987cae9be37a67e43]
# to [e6d5435e4c45032036eacbc609c67a8a64df48a9]
#
# patch "debian/compat"
# from [ccf271b7830882da1791852baeca1737fcbe4b90]
# to [d3964f9dad9f60363c81b688324d95b4ec7c8038]
#
# patch "debian/control"
# from [5a39b8a6881a3cdc62b38aba6235b6a84df9d8d9]
# to [a155ab49a082ba455454ee1c83eac9eadbc3e0de]
#
# patch "debian/copyright"
# from [ac0eaacb8481ef28f928e7ced582435c0afd47a1]
# to [83cb40387ba57d7d351da016440c689eb5b0e6f4]
#
# patch "debian/patches/series"
# from [b8fb1a187ebe7ca5e025552376b2c0f24b3dceaf]
# to [f32a3c46ff5b36cbd138c0100a0a1af8e03b221f]
#
# patch "debian/rules"
# from [d9f14b51734120a4798f0821cb208217b025597a]
# to [4ff52b9ed80ae35c25b9fb6290ff1a6c253e7c40]
#
# patch "debian/test_installed.sh"
# from [11815932c1367db2e97d2a8573c54ebde186a904]
# to [f929f5a390d5c00b8160f09b4b33e80767f02b67]
#
============================================================
--- debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+++ debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
@@ -0,0 +1 @@
+3.0 (quilt)
============================================================
--- debian/README.source be34069eefe0404e3cf70c204c933bcdd28c865c
+++ debian/README.source ff17c8267bbdb899005cf6a7e090c4c3505cb384
@@ -1,12 +1,17 @@ gprbuild 1.3.0 is packaged with GNAT GPL
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 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.
+gprbuild 1.4.1 is now available, packaged with GNAT GPL 2010, but
+fails for QtAda, complaining about single source file in two projects.
+This is fixed in upstream development sources (see AdaCore ticket
+J513-012), and will be in gprbuild 1.5. So we are waiting for that.
+gprbuild contains part of the GNAT compiler sources in the gnat
+directory. 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. In addition, there are some files marked executable
in the upstream tarball that should not be. To prepare a new build
============================================================
--- debian/changelog cea2c24dea59a9e9357ab06987cae9be37a67e43
+++ debian/changelog e6d5435e4c45032036eacbc609c67a8a64df48a9
@@ -1,3 +1,13 @@
+gprbuild (1.3.0-2) unstable; urgency=low
+
+ * change to source format 3.0 (quilt)
+
+ * bump debhelper version
+
+ * debian/control (Suggests): add gnat, ada-compiler, as required by Debian Ada Policy
+
+ -- Stephen Leake <stephen_leake@stephe-leake.org> Thu, 01 Jul 2010 20:02:22 -0400
+
gprbuild (1.3.0-1) unstable; urgency=low
* update to new upstream version. (Closes: #571013)
============================================================
--- debian/compat ccf271b7830882da1791852baeca1737fcbe4b90
+++ debian/compat d3964f9dad9f60363c81b688324d95b4ec7c8038
@@ -1 +1 @@
-6
+7
============================================================
--- debian/control 5a39b8a6881a3cdc62b38aba6235b6a84df9d8d9
+++ debian/control a155ab49a082ba455454ee1c83eac9eadbc3e0de
@@ -13,7 +13,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen
Section: devel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: gnat-4.4, g++-4.4, gcc-4.4, gfortran-4.4, gprbuild-doc
+Suggests: gnat, ada-compiler, gnat-4.4, g++-4.4, gcc-4.4, gfortran-4.4, gprbuild-doc
Description: a multi-language extensible build tool
A set of tools for processing GNAT project files. gprbuild runs tools
on the specified source files; gprclean removes the corresponding
@@ -28,6 +28,7 @@ Depends: dpkg (>= 1.15.4) | install-info
Section: doc
Architecture: all
Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Suggests: gnat, ada-compiler
Description: a multi-language extensible build tool
A set of tools for processing GNAT project files. gprbuild runs tools
on the specified source files; gprclean removes the corresponding
============================================================
--- debian/copyright ac0eaacb8481ef28f928e7ced582435c0afd47a1
+++ debian/copyright 83cb40387ba57d7d351da016440c689eb5b0e6f4
@@ -1,18 +1,19 @@ Name: gprbuild
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
Name: gprbuild
-Maintainer: AdaCore <report@gnat.com>
+Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
Source: https://libre.adacore.com/libre/download/
-Copyright: Copyright (C) 2004-2010, Free Software Foundation, Inc.
+Files: *
+Copyright: 2004-2010, Free Software Foundation, Inc.
License: GPLv2
/usr/share/common-licenses/GPL-2
Files: gnat/mlib*
-Copyright: Copyright (C) 2001-2007, AdaCore
+Copyright: 2001-2007, AdaCore
License: GPLv2
/usr/share/common-licenses/GPL-2
Files: other
-Copyright: Copyright (C) 2006-2008, AdaCore
+Copyright: 2006-2008, AdaCore
License: GPLv2
/usr/share/common-licenses/GPL-2
============================================================
--- debian/patches/series b8fb1a187ebe7ca5e025552376b2c0f24b3dceaf
+++ debian/patches/series f32a3c46ff5b36cbd138c0100a0a1af8e03b221f
@@ -4,3 +4,4 @@ sdefault.patch
info
remove_rpath.patch
sdefault.patch
+debian-changes-1.3.0-2
============================================================
--- debian/rules d9f14b51734120a4798f0821cb208217b025597a
+++ debian/rules 4ff52b9ed80ae35c25b9fb6290ff1a6c253e7c40
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# To build this package in a chroot:
-# sudo schroot -d `cd ..; pwd` --chroot=unstable -- dpkg-buildpackage -uc -us -i"_MTN|\\.mtn-ignore"
+# schroot -d `cd ..; pwd` --chroot=unstable -- dpkg-buildpackage -uc -us -i"_MTN|\\.mtn-ignore"
#
# To run lintian:
# schroot -d `cd ..; pwd` --chroot=unstable -- make -f debian/rules lint
@@ -40,7 +40,7 @@
# sudo schroot --chroot=unstable -- aptitude install libaunit1-dev
# sudo shcroot --chroot=unstable -- rm /usr/bin/gcc
#
-# sudo schroot --chroot=unstable -- ./test_installed.sh
+# schroot --chroot=unstable -- ./test_installed.sh
# sudo schroot --chroot=unstable -- ln -s /usr/bin/gcc /usr/bin/gcc-4.4
#
# to clean up after the test:
@@ -48,8 +48,6 @@
.SUFFIXES=
-include /usr/share/quilt/quilt.make
-
# We use gnatmake, not make, for parallel builds.
.NOTPARALLEL:
export CPUS := $(shell getconf _NPROCESSORS_ONLN)
@@ -58,7 +56,7 @@ export CPUS := $(shell getconf _NPROCESS
.PHONY: build binary binary-arch binary-indep clean
-build: patch generate-stamp build-stamp
+build: generate-stamp build-stamp
C_OBJS := debian/tmp/obj/gprbuild_dummies.o debian/tmp/obj/link.o
@@ -114,11 +112,10 @@ sdefault-body-stamp:
echo "end Sdefault;" >> gnat/sdefault.adb
touch sdefault-body-stamp
-clean: unpatch
+clean:
dh_testdir
dh_testroot
dh_clean -a
- dh_clean -p gprbuild-doc
rm -f *-stamp
rm -f src/gprconfig-sdefault.ads
============================================================
--- debian/test_installed.sh 11815932c1367db2e97d2a8573c54ebde186a904
+++ debian/test_installed.sh f929f5a390d5c00b8160f09b4b33e80767f02b67
@@ -8,9 +8,12 @@
# sudo schroot ./test_installed.sh
# This re-installs the latest version.
-dpkg --install ../../gprbuild_1.3.0-1_i386.deb
-dpkg --install ../../gprbuild-doc_1.3.0-1_all.deb
+sudo dpkg --install ../../gprbuild_1.3.0-1_i386.deb
+sudo dpkg --install ../../gprbuild-doc_1.3.0-1_all.deb
+# tmp is owned by root; we need write permission
+sudo chmod -R o+w tmp
+
cd ../examples
make