diff -Nru gcc-defaults-1.201ubuntu1/debian/changelog gcc-defaults-1.203ubuntu1/debian/changelog --- gcc-defaults-1.201ubuntu1/debian/changelog 2022-08-31 09:07:17.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/changelog 2023-02-17 11:52:40.000000000 +0000 @@ -1,3 +1,28 @@ +gcc-defaults (1.203ubuntu1) lunar; urgency=medium + + * Merge with Debian; remaining changes: + - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages. + + -- Matthias Klose Fri, 17 Feb 2023 12:52:40 +0100 + +gcc-defaults (1.203) unstable; urgency=medium + + * Only build gm2-doc, when building as gcc-defaults source. + * Fix control file generation for not-built gdc packages. + * Bump standards version. + + -- Matthias Klose Sun, 08 Jan 2023 10:05:59 +0100 + +gcc-defaults (1.202) unstable; urgency=medium + + * Build packages for arc-linux-gnu. + * Build a gm2-doc package. + * Provide an unversioned lto-dump binary (Jochen Sprickerhof). + Closes: #1016437. + * Remove obsolete parts from maintainer scripts. Closes: #1007764. + + -- Matthias Klose Sat, 31 Dec 2022 10:41:05 +0100 + gcc-defaults (1.201ubuntu1) kinetic; urgency=medium * Merge with Debian; remaining changes: diff -Nru gcc-defaults-1.201ubuntu1/debian/control gcc-defaults-1.203ubuntu1/debian/control --- gcc-defaults-1.201ubuntu1/debian/control 2022-08-31 09:07:17.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/control 2023-02-17 11:52:40.000000000 +0000 @@ -3,7 +3,7 @@ Priority: standard Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Build-Depends: m4, debhelper (>= 11), dpkg-dev (>= 1.17.11), gcc-12-base (>= 12.2.0-1~), @@ -2027,3 +2027,15 @@ Suggests: gccgo (>= ${version:ggo}) Description: Documentation for the GNU Go compiler Documentation for the GNU Go compiler in info format (dependency package). + +Package: gm2-doc +Section: doc +Architecture: any +Priority: optional +Depends: gm2-${pv:gm2}-doc ${reqv:gm2}, ${misc:Depends} +Suggests: gm2 (>= ${version:gm2}) +Breaks: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) +Replaces: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) +Description: Documentation for the GNU Modula-2 compiler + Documentation for the GNU Modula-2 compiler in info format (dependency + package). diff -Nru gcc-defaults-1.201ubuntu1/debian/control.gm2-doc gcc-defaults-1.203ubuntu1/debian/control.gm2-doc --- gcc-defaults-1.201ubuntu1/debian/control.gm2-doc 1970-01-01 00:00:00.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/control.gm2-doc 2023-02-17 11:52:22.000000000 +0000 @@ -0,0 +1,12 @@ + +Package: gm2-doc +Section: doc +Architecture: any +Priority: optional +Depends: gm2-${pv:gm2}-doc ${reqv:gm2}, ${misc:Depends} +Suggests: gm2 (>= ${version:gm2}) +Breaks: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) +Replaces: gm2-12-doc (<< 12.2.0-11), gm2-13-doc (<< 13-20221226-1) +Description: Documentation for the GNU Modula-2 compiler + Documentation for the GNU Modula-2 compiler in info format (dependency + package). diff -Nru gcc-defaults-1.201ubuntu1/debian/control.source gcc-defaults-1.203ubuntu1/debian/control.source --- gcc-defaults-1.201ubuntu1/debian/control.source 2022-08-31 09:07:17.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/control.source 2023-02-17 11:52:22.000000000 +0000 @@ -3,7 +3,7 @@ Priority: standard Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Build-Depends: m4, debhelper (>= 11), dpkg-dev (>= 1.17.11), gcc-12-base (>= 12.2.0-1~), diff -Nru gcc-defaults-1.201ubuntu1/debian/g77-doc.prerm gcc-defaults-1.203ubuntu1/debian/g77-doc.prerm --- gcc-defaults-1.201ubuntu1/debian/g77-doc.prerm 2020-11-17 18:53:07.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/g77-doc.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -#! /bin/sh -e - -# this is an empty script needed for the upgrade from earlier -# versions calling install-info - -#DEBHELPER# - -exit 0 diff -Nru gcc-defaults-1.201ubuntu1/debian/g77.postinst.in gcc-defaults-1.203ubuntu1/debian/g77.postinst.in --- gcc-defaults-1.201ubuntu1/debian/g77.postinst.in 2020-11-17 18:53:07.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/g77.postinst.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -#! /bin/sh -e - -# remove the doc dir, if it's still a directory and replace with a symlink -pkg=`basename $0 .postinst` -if [ ! -L /usr/share/doc/$pkg ]; then - rm -rf /usr/share/doc/$pkg - ln -s cpp /usr/share/doc/$pkg -fi - -update-alternatives --install /usr/bin/f77 f77 /usr/bin/g77 20 \ - @GFDL@--slave /usr/share/man/man1/f77.1.gz f77.1.gz /usr/share/man/man1/g77.1.gz - -#DEBHELPER# - -exit 0 diff -Nru gcc-defaults-1.201ubuntu1/debian/g77.prerm gcc-defaults-1.203ubuntu1/debian/g77.prerm --- gcc-defaults-1.201ubuntu1/debian/g77.prerm 2020-11-17 18:53:07.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/g77.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -#! /bin/sh -e - -if [ $1 != "upgrade" ]; then - update-alternatives --remove f77 /usr/bin/g77 -fi - -#DEBHELPER# diff -Nru gcc-defaults-1.201ubuntu1/debian/gdc.preinst gcc-defaults-1.203ubuntu1/debian/gdc.preinst --- gcc-defaults-1.201ubuntu1/debian/gdc.preinst 2020-11-17 18:53:07.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/gdc.preinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#! /bin/sh -e - -if [ -L /usr/share/doc/gdc ]; then - echo "Removing old gdc doc directory symlink." - rm -rf /usr/share/doc/gdc -fi - -#DEBHELPER# - -exit 0 diff -Nru gcc-defaults-1.201ubuntu1/debian/g++.postinst.in gcc-defaults-1.203ubuntu1/debian/g++.postinst.in --- gcc-defaults-1.201ubuntu1/debian/g++.postinst.in 2020-11-17 18:53:07.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/g++.postinst.in 2023-02-17 11:52:22.000000000 +0000 @@ -1,33 +1,5 @@ #! /bin/sh -e -# remove the doc dir, if it's still a directory and replace with a symlink -pkg=`basename $0 .postinst` -if [ ! -L /usr/share/doc/$pkg ]; then - rm -rf /usr/share/doc/$pkg - ln -s cpp /usr/share/doc/$pkg -fi - -# fix for report #138038: remove old diversions -if [ -n "`dpkg-divert --list /usr/bin/c++filt.binutils`" ]; then - # diversion of /usr/bin/c++filt - # to /usr/bin/c++filt.binutils - # /usr/bin/c++filt is from old g++ - # /usr/bin/c++filt.binutils is from current binutils - rm -f /usr/bin/c++filt - dpkg-divert --package g++ --rename --remove /usr/bin/c++filt \ - || true -fi -if [ -n "`dpkg-divert --list /usr/man/man1/c++filt.binutils.1.gz`" ]; then - # diversion of /usr/man/man1/c++filt.1.gz - # to /usr/man/man1/c++filt.binutils.1.gz - # /usr/man/man1/c++filt.1.gz is from old g++ - # /usr/man/man1/c++filt.binutils.1.gz does not exist any more - # /usr/share/man/man1/c++filt.1.gz is from current binutils - rm -f /usr/man/man1/c++filt.1.gz - dpkg-divert --package g++ --rename --remove /usr/man/man1/c++filt.1.gz \ - || true -fi - update-alternatives \ --install /usr/bin/c++ c++ /usr/bin/g++ 20 \ @GFDL@--slave /usr/share/man/man1/c++.1.gz c++.1.gz /usr/share/man/man1/g++.1.gz diff -Nru gcc-defaults-1.201ubuntu1/debian/rules gcc-defaults-1.203ubuntu1/debian/rules --- gcc-defaults-1.201ubuntu1/debian/rules 2022-08-31 09:07:17.000000000 +0000 +++ gcc-defaults-1.203ubuntu1/debian/rules 2023-02-17 11:52:22.000000000 +0000 @@ -219,11 +219,11 @@ DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) all_archs_mips = mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el -all_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k or1k powerpc ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 \ +all_archs = alpha arc amd64 armel armhf arm64 hppa i386 ia64 m68k or1k powerpc ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 \ $(all_archs_mips) gcc11_archs = -gcc12_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k or1k powerpc ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 \ +gcc12_archs = alpha arc amd64 armel armhf arm64 hppa i386 ia64 m68k or1k powerpc ppc64 ppc64el riscv64 s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 \ $(all_archs_mips) gnat_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 m68k or1k powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 hurd-i386 kfreebsd-amd64 kfreebsd-i386 \ @@ -349,13 +349,14 @@ hppa64_archs = amd64 hppa i386 x32 -m2_archs = alpha amd64 arm64 armel armhf i386 ia64 \ +m2_archs = alpha arc amd64 arm64 armel armhf i386 ia64 \ $(all_archs_mips) \ ppc64el riscv64 s390 s390x sparc64 mipsen_archs = amd64 i386 x32 mips64el mipsel mips64r6el arm64 ppc64el HOST_ARCHS_alpha = amd64 i386 x32 +HOST_ARCHS_arc = amd64 i386 x32 HOST_ARCHS_amd64 = arm64 i386 ppc64el x32 HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el @@ -400,7 +401,7 @@ endif else # -ports package ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32)) - CROSS_ARCHS ?= alpha hppa m68k ppc64 riscv64 sh4 sparc64 \ + CROSS_ARCHS ?= alpha arc hppa m68k ppc64 riscv64 sh4 sparc64 \ $(if $(filter $(vendor), Ubuntu),, powerpc) \ $(if $(filter $(DEB_HOST_ARCH), amd64 i386), x32) else ifeq ($(DEB_HOST_ARCH),arm64) @@ -478,7 +479,7 @@ endif ifeq (,$(filter $(DEB_HOST_ARCH),$(m2_archs))) - no_packages += gm2 + no_packages += gm2 gm2-doc endif ifeq (,$(filter $(DEB_HOST_ARCH),$(hppa64_archs))) @@ -509,12 +510,14 @@ # packages which are in the control file, but never built ... invalid_packages = \ + gccgo-arc-linux-gnu \ gccgo-hppa-linux-gnu \ gccgo-m68k-linux-gnu \ gccgo-sh4-linux-gnu \ gccgo-multilib-arm-linux-gnueabi \ gccgo-multilib-arm-linux-gnueabihf \ gdc-alpha-linux-gnu \ + gdc-arc-linux-gnu \ gdc-m68k-linux-gnu \ gdc-sh4-linux-gnu \ gdc-sparc64-linux-gnu \ @@ -737,7 +740,9 @@ -e 's/@host_archs@/$(HOST_ARCHS_$(a))/g' \ debian/control.cross.in \ $(if $(filter $(a),$(multilib_archs)), debian/control.cross-ml.in) \ - | awk '/^Package: gccgo-(hppa|m68k|sh)/ {skip=1} skip == 0 {print } /^$$/ && skip == 1 {skip=0}' \ + | awk '/^Package: gccgo-(arc|hppa|m68k|sh4)/ {skip=1} skip == 0 {print } /^$$/ && skip == 1 {skip=0}' \ + | awk '/^Package: gdc-(alpha|arc|m68k|sh4|sparc64)/ {skip=1} skip == 0 {print } /^$$/ && skip == 1 {skip=0}' \ + | awk '/^Package: gdc-multilib-sparc64/ {skip=1} skip == 0 {print } /^$$/ && skip == 1 {skip=0}' \ | awk '/^Package: gm2-(powerpc|powerpc64|sh4)-/ {skip=1} skip == 0 {print } /^$$/ && skip == 1 {skip=0}' \ >> debian/control; \ ) @@ -745,6 +750,9 @@ ifeq ($(SOURCE)-$(with_gfdl_docs),gcc-defaults-yes) cat debian/control.doc >> debian/control endif +ifeq ($(SOURCE),gcc-defaults) + cat debian/control.gm2-doc >> debian/control +endif build-arch: build build-indep: build-stamp @@ -810,6 +818,8 @@ /usr/bin/gcc-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gcc \ /usr/bin/gcov-$(PV_GCC) /usr/bin/gcov \ /usr/bin/gcov-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gcov \ + /usr/bin/lto-dump-$(PV_GCC) /usr/bin/lto-dump \ + /usr/bin/lto-dump-$(PV_GCC) /usr/bin/$(DEB_HOST_GNU_TYPE)-lto-dump \ /usr/lib/gcc/$(DEB_HOST_GNU_TYPE)/$(PV_GCC)/liblto_plugin.so /usr/lib/bfd-plugins/liblto_plugin.so \ /usr/share/doc/gcc-$(PV_GCC)/README.Bugs /usr/share/doc/cpp/README.Bugs \ $(if $(filter $(DEB_HOST_ARCH), $(gcc49_archs)),, \ @@ -846,6 +856,7 @@ /usr/share/man/man1/gcc-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gcc.1.gz \ /usr/share/man/man1/gcov-$(PV_GCC).1.gz /usr/share/man/man1/gcov.1.gz \ /usr/share/man/man1/gcov-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gcov.1.gz \ + /usr/share/man/man1/lto-dump-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-lto-dump.1.gz \ $(if $(filter $(DEB_HOST_ARCH), $(gcc49_archs)),, \ /usr/share/man/man1/gcov-tool-$(PV_GCC).1.gz /usr/share/man/man1/gcov-tool.1.gz \ /usr/share/man/man1/gcov-tool-$(PV_GCC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gcov-tool.1.gz \ @@ -900,11 +911,17 @@ dh_installdocs -pgm2 debian/README.Debian dh_link -pgm2 \ - /usr/bin/gm2-$(PV_GDC) /usr/bin/gm2 \ - /usr/bin/gm2-$(PV_GDC) /usr/bin/$(DEB_HOST_GNU_TYPE)-gm2 + /usr/bin/gm2-$(PV_GM2) /usr/bin/gm2 \ + /usr/bin/gm2-$(PV_GM2) /usr/bin/$(DEB_HOST_GNU_TYPE)-gm2 dh_link -pgm2 \ - /usr/share/man/man1/gm2-$(PV_GDC).1.gz /usr/share/man/man1/gm2.1.gz \ - /usr/share/man/man1/gm2-$(PV_GDC).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gm2.1.gz + /usr/share/man/man1/gm2-$(PV_GM2).1.gz /usr/share/man/man1/gm2.1.gz \ + /usr/share/man/man1/gm2-$(PV_GM2).1.gz /usr/share/man/man1/$(DEB_HOST_GNU_TYPE)-gm2.1.gz + : # gm2-doc + dh_installdirs -pgm2-doc \ + usr/share/doc usr/share/info + dh_link -pgm2-doc \ + /usr/share/doc/gcc-$(PV_GM2)-base/gm2.html /usr/share/doc/gm2-doc/gm2.html \ + /usr/share/info/gm2-$(PV_GM2).info.gz /usr/share/info/gm2.info.gz endif ifneq (,$(filter gobjc, $(packages))) @@ -1057,6 +1074,7 @@ /usr/share/doc/cpp-$(CROSS_PKG_GNU_TYPE) /usr/share/doc/gcc-$(CROSS_PKG_GNU_TYPE) \ /usr/bin/$(CROSS_GNU_TYPE)-gcc-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcc \ /usr/bin/$(CROSS_GNU_TYPE)-gcov-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcov \ + /usr/bin/$(CROSS_GNU_TYPE)-lto-dump-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-lto-dump \ /usr/share/doc/gcc-$(PV_GCC)-$(CROSS_PKG_GNU_TYPE)-base/README.Bugs /usr/share/doc/cpp-$(CROSS_PKG_GNU_TYPE)/README.Bugs \ $(if $(filter $(CROSS_ARCH), $(gcc49_archs)),, \ /usr/bin/$(CROSS_GNU_TYPE)-gcov-dump-$(PV_GCC_$(CROSS_ARCH)) /usr/bin/$(CROSS_GNU_TYPE)-gcov-dump \ @@ -1082,6 +1100,7 @@ dh_link -pgcc-$(CROSS_PKG_GNU_TYPE) \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcc-$(PV_GCC_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcc.1.gz \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-$(PV_GCC_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov.1.gz \ + /usr/share/man/man1/$(CROSS_GNU_TYPE)-lto-dump-$(PV_GCC_$(CROSS_ARCH)).1.gz /usr/share/man/man1/$(CROSS_GNU_TYPE)-lto-dump.1.gz \ $(if $(filter $(CROSS_ARCH), $(gcc49_archs)),, \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-tool-$(PV_GCC_$(CROSS_ARCH)).1.gz \ /usr/share/man/man1/$(CROSS_GNU_TYPE)-gcov-tool.1.gz \ @@ -1244,6 +1263,18 @@ debian/$$i/usr/share/doc/$$i/changelog.Debian; \ done endif + rm -rf debian/gm2-doc + dh_installdocs -pgm2-doc + dh_installchangelogs -pgm2-doc + for i in gm2-doc; do \ + mv debian/$$i/usr/share/doc/$$i/changelog \ + debian/$$i/usr/share/doc/$$i/changelog.Debian; \ + done + mkdir -p debian/gm2-doc/usr/share/info + ln -sf gm2-$(PV_GM2).info.gz debian/gm2-doc/usr/share/info/gm2.info.gz + mkdir -p debian/gm2-doc/usr/share/doc/gcc-$(PV_GCC)-base/m2 + ln -sf gm2-$(PV_GM2).html debian/gm2-doc/usr/share/doc/gcc-$(PV_GCC)-base/m2/gm2.html + ifneq (,$(filter gcc-hppa64-linux-gnu, $(packages))) dh_installdocs -pgcc-hppa64-linux-gnu dh_installchangelogs -pgcc-hppa64-linux-gnu @@ -1281,7 +1312,7 @@ mkdir -p -m 755 debian/$$p/usr/share/lintian/overrides; \ echo "$$p binary: no-manual-page" \ >> debian/$$p/usr/share/lintian/overrides/$$p;; \ - cpp-doc|gcc-doc|gccgo-doc|gfortran-doc) \ + cpp-doc|gcc-doc|gccgo-doc|gfortran-doc|gm2-doc) \ mkdir -p -m 755 debian/$$p/usr/share/lintian/overrides; \ echo "$$p binary: documentation-package-not-architecture-independent" \ >> debian/$$p/usr/share/lintian/overrides/$$p;; \ @@ -1305,7 +1336,7 @@ dh_gencontrol -plibgphobos-dev -u-v$(CV_GDC) endif ifneq (,$(filter gm2, $(packages))) - dh_gencontrol -pgm2 \ + dh_gencontrol -pgm2 -pgm2-doc \ -u-v$(EPOCH):$(CV_GM2) endif ifneq (,$(filter g++, $(packages)))