* Re-enable building the D frontend. Closes: #782254.

git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7961 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

6 files changed, 96 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index c1409a0..7e5a1cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-gcc-5 (5-20150404-) UNRELEASED; urgency=medium
+gcc-5 (5-20150409-1) UNRELEASED; urgency=medium
+
+  * Update to SVN 20150409
 
   [ Matthias Klose ]
   * Fix /usr/include/c++/5.0.0 symlink.
+  * Re-enable building the D frontend. Closes: #782254.
 
   [ Samuel Thibault ]
   * Fix ada builds on the Hurd and KFreeBSD. Closes: #781424.
diff --git a/debian/control b/debian/control
index 994b6ed..8a56227 100644
--- a/debian/control
+++ b/debian/control
@@ -2331,6 +2331,91 @@ Description: GNU Ada compiler Project Manager (debugging symbols)
  .
  This package contains the debugging symbols.
 
+Package: gdc-5
+Architecture: any
+Priority: optional
+Depends: gcc-5-base (>= ${gcc:SoftVersion}), g++-5 (>= ${gcc:SoftVersion}), ${dep:gdccross}, ${dep:phobosdev}, ${shlibs:Depends}, ${misc:Depends}
+Provides: gdc, d-compiler, d-v2-compiler
+Replaces: gdc (<< 4.4.6-5)
+Description: GNU D compiler (version 2)
+ This is the GNU D compiler, which compiles D on platforms supported by gcc.
+ It uses the gcc backend to generate optimised code.
+ .
+ This compiler supports D language version 2.
+
+Package: gdc-5-multilib
+Architecture: any
+Priority: optional
+Depends: gcc-5-base (>= ${gcc:SoftVersion}), gdc-5 (= ${gcc:Version}), gcc-5-multilib (= ${gcc:Version}), ${dep:libphobosbiarchdev}${shlibs:Depends}, ${misc:Depends}
+Description: GNU D compiler (version 2, multilib files)
+ This is the GNU D compiler, which compiles D on platforms supported by gcc.
+ It uses the gcc backend to generate optimised code.
+ .
+ On architectures with multilib support, the package contains files
+ and dependencies for the non-default multilib architecture(s).
+
+Package: libphobos-5-dev
+Architecture: amd64 armel armhf i386 x32 kfreebsd-amd64 kfreebsd-i386
+Section: libdevel
+Priority: optional
+Depends: gcc-5-base (= ${gcc:Version}), zlib1g-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: Phobos D standard library
+ This is the Phobos standard library that comes with the D2 compiler.
+ .
+ For more information check http://www.dlang.org/phobos/
+
+#Package: libphobos`'PHOBOS_V`'PV`'TS-dbg
+#Section: debug
+#Architecture: ifdef(`TARGET',`CROSS_ARCH',`libphobos_archs')
+#Priority: extra
+#Depends: BASEDEP, libphobos`'PHOBOS_V`'PV-dev (= ${gdc:Version}), ${misc:Depends}
+#Provides: libphobos`'PHOBOS_V`'TS-dbg
+#BUILT_USING`'dnl
+#Description: The Phobos D standard library (debug symbols)
+# This is the Phobos standard library that comes with the D2 compiler.
+# .
+# For more information check http://www.dlang.org/phobos/
+
+Package: lib64phobos-5-dev
+Architecture: i386 powerpc sparc s390 mips mipsel mipsn32 mipsn32el x32
+Section: libdevel
+Priority: optional
+Depends: gcc-5-base (= ${gcc:Version}), lib64gcc-5-dev (= ${gcc:Version}), lib64z1-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: Phobos D standard library (64bit development files)
+ This is the Phobos standard library that comes with the D2 compiler.
+ .
+ For more information check http://www.dlang.org/phobos/
+
+Package: lib32phobos-5-dev
+Architecture: amd64 ppc64 kfreebsd-amd64 s390x sparc64 x32 mipsn32 mipsn32el mips64 mips64el
+Section: libdevel
+Priority: optional
+Depends: gcc-5-base (= ${gcc:Version}), lib32gcc-5-dev (= ${gcc:Version}), lib32z1-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: Phobos D standard library (64bit development files)
+ This is the Phobos standard library that comes with the D2 compiler.
+ .
+ For more information check http://www.dlang.org/phobos/
+
+Package: libn32phobos-5-dev
+Architecture: mips mipsel mips64 mips64el
+Section: libdevel
+Priority: optional
+Depends: gcc-5-base (= ${gcc:Version}), libn32gcc-5-dev (= ${gcc:Version}), libn32z1-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: Phobos D standard library (n32 development files)
+ This is the Phobos standard library that comes with the D2 compiler.
+ .
+ For more information check http://www.dlang.org/phobos/
+
+Package: libx32phobos-5-dev
+Architecture: amd64 i386
+Section: libdevel
+Priority: optional
+Depends: gcc-5-base (= ${gcc:Version}), libx32gcc-5-dev (= ${gcc:Version}), libx32z1-dev, ${shlibs:Depends}, ${misc:Depends}
+Description: Phobos D standard library (x32 development files)
+ This is the Phobos standard library that comes with the D2 compiler.
+ .
+ For more information check http://www.dlang.org/phobos/
+
 #Package: gcc`'PV-soft-float
 #Architecture: arm armel armhf
 #Priority: PRI(optional)
diff --git a/debian/patches/libphobos-configury.diff b/debian/patches/libphobos-configury.diff
deleted file mode 100644
index 47f970d..0000000
--- a/debian/patches/libphobos-configury.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-# DP: libphobos configure: Call AM_MAINTAINER_MODE
-
---- a/src/libphobos/configure.ac
-+++ b/src/libphobos/configure.ac
-@@ -132,7 +132,7 @@
- AC_ARG_WITH(system-zlib,
-   AS_HELP_STRING([--with-system-zlib],
-                  [use installed libz (default: no)]),
--  :,[system_zlib=no])
-+  [system_zlib=yes],[system_zlib=no])
- 
- AC_ARG_ENABLE(phobos-config-dir,
-   AC_HELP_STRING([--enable-phobos-config-dir=<dir>],
diff --git a/debian/rules.d/binary-d.mk b/debian/rules.d/binary-d.mk
index 526553a..ce9bd10 100644
--- a/debian/rules.d/binary-d.mk
+++ b/debian/rules.d/binary-d.mk
@@ -60,6 +60,8 @@ ifeq ($(DEB_CROSS),yes)
 else
   gdc_include_dir := $(PF)/include/d/$(BASE_VERSION)
 endif
+# FIXME: always here?
+gdc_include_dir := $(gcc_lib_dir)/include/d
 
 dirs_gdc = \
 	$(PF)/bin \
@@ -114,11 +116,11 @@ endif
 	mkdir -p $(d_gdc)/$(gdc_include_dir)
 	cp $(srcdir)/libphobos/libdruntime/object.di \
 	    $(d_gdc)/$(gdc_include_dir)/.
-ifneq ($(DEB_CROSS),yes)
-	dh_link -p$(p_gdc) \
-		/$(gdc_include_dir) \
-		/$(dir $(gdc_include_dir))/$(GCC_VERSION)
-endif
+#ifneq ($(DEB_CROSS),yes)
+#	dh_link -p$(p_gdc) \
+#		/$(gdc_include_dir) \
+#		/$(dir $(gdc_include_dir))/$(GCC_VERSION)
+#endif
 
 	dh_link -p$(p_gdc) \
 		/$(docdir)/$(p_gcc)/README.Bugs \
diff --git a/debian/rules.defs b/debian/rules.defs
index 1016b30..43b6d2a 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -867,8 +867,6 @@ ifeq ($(with_base_only),yes)
   with_d := no
 endif
 
-with_d := not updated to current trunk
-
 ifeq ($(with_d)-$(with_separate_gdc),yes-yes)
   ifneq (,$(findstring gdc,$(PKGSOURCE)))
     languages := c c++
diff --git a/debian/rules.patch b/debian/rules.patch
index 47c5af1..20be96b 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -164,7 +164,6 @@ ifeq ($(with_d),yes)
   endif
   ifeq ($(with_libphobos),yes)
     debian_patches += gdc-libphobos-build
-    debian_patches += libphobos-configury
   else
     debian_patches += gdc-driver-nophobos
   endif