reassign 456596 gcc-defaults 1.61 thanks
Matthias, Here is the diff against current SVN I already sent you. Cheers, Arthur.
From 3c86dc3d32b0570aa29e8b8e7dfd9bd69f186b02 Mon Sep 17 00:00:00 2001
From: Arthur Loiret <[EMAIL PROTECTED]>
Date: Sun, 16 Dec 2007 23:40:33 +0100
Subject: [PATCH] Add gdc to gcc-defaults.
---
gcc-defaults/debian/README.Debian | 6 +++-
gcc-defaults/debian/README.Debian.m4 | 6 +++-
gcc-defaults/debian/changelog | 3 ++
gcc-defaults/debian/control | 10 ++++++++
gcc-defaults/debian/rules | 39 +++++++++++++++++++++++++++++++++-
5 files changed, 59 insertions(+), 5 deletions(-)
diff --git a/gcc-defaults/debian/README.Debian b/gcc-defaults/debian/README.Debian
index 712ba92..de418c4 100644
--- a/gcc-defaults/debian/README.Debian
+++ b/gcc-defaults/debian/README.Debian
@@ -67,6 +67,7 @@ The default compiler versions for Debian GNU/Linux on i386 are
gobjc++ : gobjc++-4.2
gnat : gnat-4.2
gpc : gpc-4.1
+ gdc : gdc-4.1
Most of the documentation for GCC including the manual pages is
licensed under the GFDL and therefore not included in the main section.
@@ -155,8 +156,8 @@ Maintainers of these packages
Matthias Klose <[EMAIL PROTECTED]>
Ray Dassen <[EMAIL PROTECTED]>
Philip Blundell <[EMAIL PROTECTED]> (arm-linux)
-Jeff Bailey <[EMAIL PROTECTED]> (hurd-i386)
-Joel Baker <[EMAIL PROTECTED]> (netbsd-i386)
+Jeff Bailey <[EMAIL PROTECTED]> (hurd-i386)
+Joel Baker <[EMAIL PROTECTED]> (netbsd-i386)
Ben Collins <[EMAIL PROTECTED]> (sparc-linux)
Falk Hueffner <[EMAIL PROTECTED]> (alpha-linux)
Randolph Chung <[EMAIL PROTECTED]> (ia64-linux, hppa-linux)
@@ -165,6 +166,7 @@ Dan Jacobowitz <[EMAIL PROTECTED]> (powerpc-linux)
Gerhard Tonn <[EMAIL PROTECTED]> (s390-linux)
Roman Zippel <[EMAIL PROTECTED]> (m68k-linux)
Ludovic Brenta <[EMAIL PROTECTED]> (gnat)
+Arthur Loiret <[EMAIL PROTECTED]> (gdc)
===============================================================================
diff --git a/gcc-defaults/debian/README.Debian.m4 b/gcc-defaults/debian/README.Debian.m4
index 4eb5178..05c0b8d 100644
--- a/gcc-defaults/debian/README.Debian.m4
+++ b/gcc-defaults/debian/README.Debian.m4
@@ -72,6 +72,7 @@ ifenabled(`gobjc',` gobjc : gobjc-PV_GOBJC')
ifenabled(`gobjc++',` gobjc++ : gobjc++-PV_GOBJCXX')
ifenabled(`gnat',` gnat : gnat-PV_GCC')
ifenabled(`gpc',` gpc : gpc-PV_GPC')
+ifenabled(`gdc',` gdc : gdc-PV_GDC')
ifenabled(`chill',` chill : chill-PV_CHILL')
ifdef(`GFDL',`dnl
@@ -172,8 +173,8 @@ Maintainers of these packages
Matthias Klose <[EMAIL PROTECTED]>
Ray Dassen <[EMAIL PROTECTED]>
Philip Blundell <[EMAIL PROTECTED]> (arm-linux)
-Jeff Bailey <[EMAIL PROTECTED]> (hurd-i386)
-Joel Baker <[EMAIL PROTECTED]> (netbsd-i386)
+Jeff Bailey <[EMAIL PROTECTED]> (hurd-i386)
+Joel Baker <[EMAIL PROTECTED]> (netbsd-i386)
Ben Collins <[EMAIL PROTECTED]> (sparc-linux)
Falk Hueffner <[EMAIL PROTECTED]> (alpha-linux)
Randolph Chung <[EMAIL PROTECTED]> (ia64-linux, hppa-linux)
@@ -182,6 +183,7 @@ Dan Jacobowitz <[EMAIL PROTECTED]> (powerpc-linux)
Gerhard Tonn <[EMAIL PROTECTED]> (s390-linux)
Roman Zippel <[EMAIL PROTECTED]> (m68k-linux)
Ludovic Brenta <[EMAIL PROTECTED]> (gnat)
+Arthur Loiret <[EMAIL PROTECTED]> (gdc)
===============================================================================
diff --git a/gcc-defaults/debian/changelog b/gcc-defaults/debian/changelog
index 4428b10..59e22b4 100644
--- a/gcc-defaults/debian/changelog
+++ b/gcc-defaults/debian/changelog
@@ -8,6 +8,9 @@ gcc-defaults (1.62) unstable; urgency=low
[Ludovic Brenta]
* Make gnat-4.2 the default (instead of gnat-4.1).
+ [Arthur Loiret]
+ * Add gdc, make gdc-4.1 the default.
+
-- Matthias Klose <[EMAIL PROTECTED]> Fri, 19 Oct 2007 12:39:43 +0200
gcc-defaults (1.61) unstable; urgency=medium
diff --git a/gcc-defaults/debian/control b/gcc-defaults/debian/control
index f78c351..fc84a56 100644
--- a/gcc-defaults/debian/control
+++ b/gcc-defaults/debian/control
@@ -238,3 +238,13 @@ Description: The GNU Ada compiler
This is a dependency package providing the default GNU Ada compiler.
Per policy, all packages that contain Ada sources must use this package
in their Build-Depends line.
+
+Package: gdc
+Priority: optional
+Architecture: any
+Depends: gdc-${pv:gdc} ${reqv:gdc}
+Replaces: gdc-4.1 (<< 0.25-4.1.2-18)
+Description: The D compiler
+ This is a dependency package providing the default D compiler.
+ Per policy, all packages that contain D sources must use this package
+ in their Build-Depends line.
diff --git a/gcc-defaults/debian/rules b/gcc-defaults/debian/rules
index a49bb4a..9e99c79 100755
--- a/gcc-defaults/debian/rules
+++ b/gcc-defaults/debian/rules
@@ -72,6 +72,7 @@ REL_NO_421 := $(shell expr $(VMINOR) - 55)$(REL_EXT)
REL_NO_422 := $(shell expr $(VMINOR) - 61)$(REL_EXT)
GPC_VERSION := 2.1
+GDC_VERSION := 0.25
# minimum required gcc-X.Y versions
REQV_295 := (>= 1:2.95.4-16)
@@ -87,6 +88,7 @@ REQV_41_GCJ := (>= 4.1.2-1)
REQV_41_GPC := (>= $(GPC_VERSION)-4.1.2-16)
REQV_42 := (>= 4.2.2-3)
REQV_42_GCJ := (>= 4.2.2-3)
+REQV_41_GDC := (>= $(GDC_VERSION)-4.1.2-18)
REQV_LIBGCJ_BC := (>= 4.2.2-1)
@@ -110,6 +112,7 @@ CV_GIJ := 4.2.2-$(REL_NO_422)
CV_LIBGCJBC := 4.2.2-$(REL_NO_422)
CV_GNAT := 4.2.2-1
CV_GPC := $(GPC_VERSION)-4.1.2-$(REL_NO_412)
+CV_GDC := 4.1.2-$(REL_NO_412)
CV_LIBGCJCOMMON := 1:4.2.2-$(REL_NO_422)
REQV_CHILL = $(REQV_295)
@@ -125,12 +128,13 @@ REQV_GFORT = $(REQV_42)
REQV_GCJ = $(REQV_42_GCJ)
REQV_GIJ = $(REQV_42_GCJ)
REQV_GPC = $(REQV_41_GPC)
+REQV_GDC = $(REQV_41_GDC)
EPOCH=4
EPOCH_GPC=5
OS_NAME := Linux
distribution := $(shell lsb_release -is)
-all_packages := gnat g++ g77 gfortran gcj gobjc gobjc++ gpc
+all_packages := gnat g++ g77 gfortran gcj gobjc gobjc++ gpc gdc
no_packages := chill
LIBGCJ = libgcj8-1
@@ -278,6 +282,7 @@ packages := $(filter-out $(no_packages), $(all_packages))
V_CPP := $(shell echo $(CV_CPP) | sed 's/-[^-]*$$//')
V_GCC := $(shell echo $(CV_GCC) | sed 's/-[^-]*$$//')
V_GNAT := $(shell echo $(CV_GNAT) | sed 's/-[^-]*$$//')
+V_GDC := $(shell echo $(CV_GDC) | sed 's/-[^-]*$$//')
V_GPP := $(shell echo $(CV_GPP) | sed 's/-[^-]*$$//')
V_GOBJC := $(shell echo $(CV_GOBJC) | sed 's/-[^-]*$$//')
V_GOBJCXX := $(shell echo $(CV_GOBJCXX) | sed 's/-[^-]*$$//')
@@ -296,6 +301,7 @@ V_GPC := $(shell echo $(CV_GPC) | sed 's/$(GPC_VERSION)-//;s/-[^-]*$$//')
PV_CPP := $(shell echo $(V_CPP) | awk -F. '{printf "%d.%d", $$1, $$2}')
PV_GCC := $(shell echo $(V_GCC) | awk -F. '{printf "%d.%d", $$1, $$2}')
PV_GNAT := $(shell echo $(V_GNAT) | awk -F. '{printf "%d.%d", $$1, $$2}')
+PV_GDC := $(shell echo $(V_GDC) | awk -F. '{printf "%d.%d", $$1, $$2}')
PV_GPP := $(shell echo $(V_GPP) | awk -F. '{printf "%d.%d", $$1, $$2}')
PV_GOBJC:= $(shell echo $(V_GOBJC) | awk -F. '{printf "%d.%d", $$1, $$2}')
PV_GOBJCXX:= $(shell echo $(V_GOBJCXX) | awk -F. '{printf "%d.%d", $$1, $$2}')
@@ -321,6 +327,7 @@ README:
-DV_GCJ=$(V_GCJ) -DPV_GCJ=$(PV_GCJ) \
-DV_GIJ=$(V_GIJ) -DPV_GIJ=$(PV_GIJ) \
-DV_GPC=$(V_GPC) -DPV_GPC=$(PV_GPC) \
+ -DV_GDC=$(V_GDC) -DPV_GDC=$(PV_GDC) \
$(if $(filter yes,$(with_gfdl_docs)), -DGFDL) \
debian/README.Debian.m4 > debian/README.Debian.tmp2
uniq debian/README.Debian.tmp2 > debian/README.Debian.tmp
@@ -354,6 +361,7 @@ substvars:
echo 'pv:gij=$(PV_GIJ)'; \
echo 'pv:gpc=$(PV_GPC)'; \
echo 'pv:gnat=$(PV_GNAT)'; \
+ echo 'pv:gdc=$(PV_GDC)'; \
echo 'reqv:cpp=$(REQV_CPP)'; \
echo 'reqv:gcc=$(REQV_GCC)'; \
echo 'reqv:gpp=$(REQV_GPP)'; \
@@ -366,6 +374,7 @@ substvars:
echo 'reqv:gij=$(REQV_GIJ)'; \
echo 'reqv:gpc=$(REQV_GPC)'; \
echo 'reqv:gnat=$(REQV_GNAT)'; \
+ echo 'reqv:gdc=$(REQV_GDC)'; \
echo 'pkg:libgcj=$(LIBGCJ)'; \
echo 'pkg:libgcjawt=$(LIBGCJ)-awt'; \
echo 'version:libgcjbc=$(CV_LIBGCJBC)'; \
@@ -489,6 +498,31 @@ ifneq (,$(findstring gnat,$(packages)))
endif
endif
+ifneq (,$(filter gdc, $(packages)))
+ : # gdc
+ dh_installdirs -pgdc \
+ usr/share/doc usr/bin usr/share/man/man1
+ dh_link -pgdc \
+ /usr/share/doc/cpp /usr/share/doc/gdc
+
+ # gdc binaries
+ dh_link -pgdc \
+ /usr/bin/gdc-$(PV_GDC) /usr/bin/gdc \
+ /usr/bin/gdc-$(PV_GDC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdc-$(PV_GDC) \
+ /usr/bin/gdc-$(PV_GDC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdc
+ # gdmd binaries
+ dh_link -pgdc \
+ /usr/bin/gdmd-$(PV_GDC) /usr/bin/gdmd \
+ /usr/bin/gdmd-$(PV_GDC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdmd-$(PV_GDC) \
+ /usr/bin/gdmd-$(PV_GDC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gdmd
+ # manpages
+ dh_link -pgdc \
+ /usr/share/man/man1/gdc-$(PV_GDC).1.gz /usr/share/man/man1/gdc.1.gz \
+ /usr/share/man/man1/gdc-$(PV_GDC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdc.1.gz \
+ /usr/share/man/man1/gdmd-$(PV_GDC).1.gz /usr/share/man/man1/gdmd.1.gz \
+ /usr/share/man/man1/gdmd-$(PV_GDC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdmd.1.gz
+endif
+
ifneq (,$(filter gobjc, $(packages)))
: # gobjc
dh_installdirs -pgobjc usr/share/doc
@@ -779,6 +813,9 @@ ifneq (,$(filter gnat, $(packages)))
dh_gencontrol -pgnat-doc -u-v$(CV_GNAT)
endif
endif
+ifneq (,$(filter gdc, $(packages)))
+ dh_gencontrol -pgdc -u-v$(CV_GDC)
+endif
ifneq (,$(filter g++, $(packages)))
dh_gencontrol -pg++ -u-v$(EPOCH):$(CV_GPP)
ifeq ($(with_multilib),yes)
--
1.5.3.7
signature.asc
Description: Digital signature
