diff -Nru /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/changelog 
/tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/changelog
--- /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/changelog  2007-09-04 
02:41:56.000000000 +0200
+++ /tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/changelog        2007-12-19 
10:17:55.000000000 +0100
@@ -1,3 +1,10 @@
+gcc-defaults (1.61.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add gdc, make gdc-4.1 the default. Closes: #456596
+
+ -- Arthur Loiret <[EMAIL PROTECTED]>  Wed, 19 Dec 2007 10:17:51 +0100
+
 gcc-defaults (1.61) unstable; urgency=medium
 
   * libgcj-common: Update classmap db's for gcj-4.3 as well.
diff -Nru /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/control 
/tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/control
--- /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/control    2007-09-03 
00:12:53.000000000 +0200
+++ /tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/control  2007-12-19 
10:00:31.000000000 +0100
@@ -238,3 +238,13 @@
  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 -Nru /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/README.Debian 
/tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/README.Debian
--- /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/README.Debian      2007-09-01 
12:05:15.000000000 +0200
+++ /tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/README.Debian    2007-12-19 
10:08:47.000000000 +0100
@@ -67,6 +67,7 @@
        gobjc++         : gobjc++-4.2
        gnat            : gnat-4.2
        gpc             : gpc-2.1-3.4
+       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 @@
 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 @@
 Gerhard Tonn <[EMAIL PROTECTED]>               (s390-linux)
 Roman Zippel <[EMAIL PROTECTED]>               (m68k-linux)
 Ludovic Brenta <[EMAIL PROTECTED]>     (gnat)
+Arthur Loiret <[EMAIL PROTECTED]>              (gdc)
 
 ===============================================================================
 
diff -Nru /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/README.Debian.m4 
/tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/README.Debian.m4
--- /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/README.Debian.m4   2006-08-14 
00:05:29.000000000 +0200
+++ /tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/README.Debian.m4 2007-12-19 
09:59:30.000000000 +0100
@@ -72,6 +72,7 @@
 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 @@
 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 @@
 Gerhard Tonn <[EMAIL PROTECTED]>               (s390-linux)
 Roman Zippel <[EMAIL PROTECTED]>               (m68k-linux)
 Ludovic Brenta <[EMAIL PROTECTED]>     (gnat)
+Arthur Loiret <[EMAIL PROTECTED]>              (gdc)
 
 ===============================================================================
 
diff -Nru /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/rules 
/tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/rules
--- /tmp/z2bNG5yT2j/gcc-defaults-1.61/debian/rules      2007-09-03 
00:46:50.000000000 +0200
+++ /tmp/eh3mQ9ni2v/gcc-defaults-1.61.1/debian/rules    2007-12-19 
10:09:29.000000000 +0100
@@ -71,6 +71,7 @@
 REL_NO_421     := $(shell expr $(VMINOR) - 55)$(REL_EXT)
 
 GPC_VERSION    := 2.1
+GDC_VERSION    := 0.25
 
 # minimum required gcc-X.Y versions
 REQV_295       := (>= 1:2.95.4-16)
@@ -85,7 +86,7 @@
 REQV_41_GCJ    := (>= 4.1.2-1)
 REQV_42                := (>= 4.2.1-3)
 REQV_42_GCJ    := (>= 4.2.1-5)
-
+REQV_41_GDC    := (>= $(GDC_VERSION)-4.1.2-18)
 REQV_LIBGCJ_BC := (>= 4.2.1-1)
 
 # architecture dependent variables
@@ -107,6 +108,7 @@
 CV_GIJ         := 4.2.1-$(REL_NO_421)
 CV_LIBGCJBC    := 4.2.1-$(REL_NO_421)
 CV_GNAT                := 4.1.2-$(REL_NO_412)
+CV_GDC         := 4.1.2-$(REL_NO_412)
 CV_LIBGCJCOMMON        := 1:4.2.1-$(REL_NO_421)
 
 REQV_CHILL     = $(REQV_295)
@@ -122,11 +124,12 @@
 REQV_GCJ       = $(REQV_42_GCJ)
 REQV_GIJ       = $(REQV_42_GCJ)
 REQV_GPC       = $(REQV_34)
+REQV_GDC       = $(REQV_41_GDC)
 
 EPOCH=4
 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 +281,7 @@
 ifneq (,$(CV_GNAT_HACKED))
   V_GNAT       := $(shell echo $(CV_GNAT_HACKED)  | sed 's/-[^-]*$$//')
 endif
+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 +300,7 @@
 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}')
@@ -322,6 +327,7 @@
           -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
@@ -355,6 +361,7 @@
          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)'; \
@@ -367,6 +374,7 @@
          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)'; \
@@ -490,6 +498,35 @@
   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/gdc-$(PV_GDC).1.gz 
/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdc-$(PV_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 \
+               /usr/share/man/man1/gdmd-$(PV_GDC).1.gz 
/usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gdmd-$(PV_GDC).1.gz
+endif
+
 ifneq (,$(filter gobjc, $(packages)))
        : # gobjc
        dh_installdirs -pgobjc usr/share/doc
@@ -780,6 +817,9 @@
        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)

Attachment: signature.asc
Description: Digital signature

Reply via email to