=== modified file 'debian/changelog' --- debian/changelog 2010-06-02 23:48:47 +0000 +++ debian/changelog 2010-06-13 09:39:56 +0000 @@ -1,3 +1,18 @@ +gcc-4.4 (4.4.4-4ubuntu2) UNRELEASED; urgency=low + + * Update debian/rules.d/binary-libgcc-cross.mk to use debian/dh_doclink + instead of dh_installdocs / dh_installchangelogs. + * Add support for libgcc -dbg packages when creating cross-compiler + packages. + - Update debian/rules.d/binary-libgcc-cross.mk to match + debian/rules.d/binary-libgcc.mk calls for -dbg packages. + - Fix debian/control.m4 so that the libgcc-dbg dep on libgcc uses the + proper `'LV suffix (i.e. the -cross suffix in package deps). + * Add support for with_standalone_gcj in + debian/rules.d/binary-libgcc-cross.mk. + + -- Loïc Minier Sun, 13 Jun 2010 10:41:16 +0200 + gcc-4.4 (4.4.4-4ubuntu1) maverick; urgency=low * Merge with Debian. === modified file 'debian/control.m4' --- debian/control.m4 2010-05-27 17:26:49 +0000 +++ debian/control.m4 2010-06-13 09:36:58 +0000 @@ -179,7 +179,7 @@ Architecture: ifdef(`TARGET',`all',`any') Section: debug Priority: extra -Depends: BASEDEP, libgcc1 (= ${gcc:EpochVersion}), ${misc:Depends} +Depends: BASEDEP, libgcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') Debug symbols for the GCC support library. ifdef(`TARGET', `dnl === modified file 'debian/rules.d/binary-libgcc-cross.mk' --- debian/rules.d/binary-libgcc-cross.mk 2010-05-01 14:20:09 +0000 +++ debian/rules.d/binary-libgcc-cross.mk 2010-06-13 09:37:07 +0000 @@ -12,16 +12,24 @@ endif p_lgcc = libgcc$(GCC_SONAME)$(cross_lib_arch) +p_lgccdbg = libgcc$(GCC_SONAME)-dbg$(cross_lib_arch) d_lgcc = debian/$(p_lgcc) +d_lgccdbg = debian/$(p_lgccdbg) p_l32gcc = lib32gcc$(GCC_SONAME)$(cross_lib_arch) +p_l32gccdbg = lib32gcc$(GCC_SONAME)-dbg$(cross_lib_arch) d_l32gcc = debian/$(p_l32gcc) +d_l32gccdbg = debian/$(p_l32gccdbg) p_l64gcc = lib64gcc$(GCC_SONAME)$(cross_lib_arch) +p_l64gccdbg = lib64gcc$(GCC_SONAME)-dbg$(cross_lib_arch) d_l64gcc = debian/$(p_l64gcc) +d_l64gccdbg = debian/$(p_l64gccdbg) p_ln32gcc = libn32gcc$(GCC_SONAME)$(cross_lib_arch) +p_ln32gccdbg = libn32gcc$(GCC_SONAME)-dbg$(cross_lib_arch) d_ln32gcc = debian/$(p_ln32gcc) +d_ln32gccdbg = debian/$(p_ln32gccdbg) # ---------------------------------------------------------------------- $(binary_stamp)-libgcc: $(install_dependencies) @@ -29,7 +37,7 @@ dh_testroot mv $(install_stamp) $(install_stamp)-tmp - rm -rf $(d_lgcc) + rm -rf $(d_lgcc) $(d_lgccdbg) dh_installdirs -p$(p_lgcc) \ $(docdir)/$(p_lgcc) \ $(PF)/$(DEB_TARGET_GNU_TYPE)/lib @@ -38,13 +46,18 @@ mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libgcc_s.so.$(GCC_SONAME) $(d_lgcc)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/. endif - dh_installdocs -p$(p_lgcc) - dh_installchangelogs -p$(p_lgcc) - +ifeq ($(with_standalone_gcj),yes) + debian/dh_doclink -p$(p_lgcc) $(p_jbase) + debian/dh_doclink -p$(p_lgccdbg) $(p_jbase) +else + debian/dh_doclink -p$(p_lgcc) $(p_base) + debian/dh_doclink -p$(p_lgccdbg) $(p_base) +endif debian/dh_rmemptydirs -p$(p_lgcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lgcc) - dh_compress -p$(p_lgcc) - dh_fixperms -p$(p_lgcc) + debian/dh_rmemptydirs -p$(p_lgccdbg) + PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lgcc) --dbg-package=$(p_lgccdbg) + dh_compress -p$(p_lgcc) -p$(p_lgccdbg) + dh_fixperms -p$(p_lgcc) -p$(p_lgccdbg) ifeq ($(with_shared_libgcc),yes) # dpkg-gensymbols doesn't work for cross builds # if [ -f debian/libgcc$(GCC_SONAME).symbols.$(DEB_TARGET_ARCH) ]; then \ @@ -59,7 +72,7 @@ endif $(SET_CROSS_LIB_PATH) ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lgcc) sed -i 's@[ =]lib[^ ,]*@&$(cross_lib_arch)@g' debian/$(p_lgcc).substvars - dh_gencontrol -p$(p_lgcc) \ + dh_gencontrol -p$(p_lgcc) -p$(p_lgccdbg) \ -- -v$(DEB_LIBGCC_VERSION) $(common_substvars) b=libgcc; v=$(GCC_SONAME); \ for ext in preinst postinst prerm postrm; do \ @@ -67,9 +80,9 @@ cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \ fi; \ done - dh_installdeb -p$(p_lgcc) - dh_md5sums -p$(p_lgcc) - dh_builddeb -p$(p_lgcc) + dh_installdeb -p$(p_lgcc) -p$(p_lgccdbg) + dh_md5sums -p$(p_lgcc) -p$(p_lgccdbg) + dh_builddeb -p$(p_lgcc) -p$(p_lgccdbg) trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp) @@ -79,7 +92,7 @@ dh_testroot mv $(install_stamp) $(install_stamp)-tmp - rm -rf $(d_l64gcc) + rm -rf $(d_l64gcc) $(d_l64gccdbg) dh_installdirs -p$(p_l64gcc) \ $(docdir)/$(p_l64gcc) \ $(PF)/$(DEB_TARGET_GNU_TYPE)/lib64 @@ -88,13 +101,13 @@ mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/libgcc_s.so.$(GCC_SONAME) $(d_l64gcc)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/. endif - dh_installdocs -p$(p_l64gcc) - dh_installchangelogs -p$(p_l64gcc) - + debian/dh_doclink -p$(p_l64gcc) $(p_base) + debian/dh_doclink -p$(p_l64gccdbg) $(p_base) debian/dh_rmemptydirs -p$(p_l64gcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l64gcc) - dh_compress -p$(p_l64gcc) - dh_fixperms -p$(p_l64gcc) + debian/dh_rmemptydirs -p$(p_l64gccdbg) + PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l64gcc) --dbg-package=$(p_l64gccdbg) + dh_compress -p$(p_l64gcc) -p$(p_l64gccdbg) + dh_fixperms -p$(p_l64gcc) -p$(p_l64gccdbg) ifeq ($(with_shared_libgcc),yes) dh_makeshlibs -p$(p_l64gcc) -n sed s/$(cross_lib_arch)//g < debian/$(p_l64gcc)/DEBIAN/shlibs > debian/$(p_l64gcc)/DEBIAN/shlibs.fixed @@ -103,7 +116,7 @@ endif ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_l64gcc) sed -i 's@[ =]lib[^ ,]*@&$(cross_lib_arch)@g' debian/$(p_l64gcc).substvars - dh_gencontrol -p$(p_l64gcc) \ + dh_gencontrol -p$(p_l64gcc) -p$(p_l64gccdbg) \ -- -v$(DEB_VERSION) $(common_substvars) b=libgcc; v=$(GCC_SONAME); \ for ext in preinst postinst prerm postrm; do \ @@ -111,9 +124,9 @@ cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \ fi; \ done - dh_installdeb -p$(p_l64gcc) - dh_md5sums -p$(p_l64gcc) - dh_builddeb -p$(p_l64gcc) + dh_installdeb -p$(p_l64gcc) -p$(p_l64gccdbg) + dh_md5sums -p$(p_l64gcc) -p$(p_l64gccdbg) + dh_builddeb -p$(p_l64gcc) -p$(p_l64gccdbg) trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp) @@ -124,7 +137,7 @@ dh_testroot mv $(install_stamp) $(install_stamp)-tmp - rm -rf $(d_l32gcc) + rm -rf $(d_l32gcc) $(d_l32gccdbg) dh_installdirs -p$(p_l32gcc) \ $(docdir)/$(p_l32gcc) \ $(PF)/$(DEB_TARGET_GNU_TYPE)/lib32 @@ -133,22 +146,22 @@ mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/libgcc_s.so.$(GCC_SONAME) $(d_l32gcc)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/. endif - dh_installdocs -p$(p_l32gcc) - dh_installchangelogs -p$(p_l32gcc) - + debian/dh_doclink -p$(p_l32gcc) $(p_base) + debian/dh_doclink -p$(p_l32gccdbg) $(p_base) debian/dh_rmemptydirs -p$(p_l32gcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l32gcc) - dh_compress -p$(p_l32gcc) - dh_fixperms -p$(p_l32gcc) + debian/dh_rmemptydirs -p$(p_l32gccdbg) + PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l32gcc) --dbg-package=$(p_l32gccdbg) + dh_compress -p$(p_l32gcc) -p$(p_l32gccdbg) + dh_fixperms -p$(p_l32gcc) -p$(p_l32gccdbg) ifeq ($(with_shared_libgcc),yes) - dh_makeshlibs -p$(p_l32gcc) -n + dh_makeshlibs -p$(p_l32gcc) -p$(p_l32gccdbg) -n sed s/$(cross_lib_arch)//g < debian/$(p_l32gcc)/DEBIAN/shlibs > debian/$(p_l32gcc)/DEBIAN/shlibs.fixed mv debian/$(p_l32gcc)/DEBIAN/shlibs.fixed debian/$(p_l32gcc)/DEBIAN/shlibs cat debian/$(p_l32gcc)/DEBIAN/shlibs >> debian/shlibs.local endif ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_l32gcc) sed -i 's@[ =]lib[^ ,]*@&$(cross_lib_arch)@g' debian/$(p_l32gcc).substvars - dh_gencontrol -p$(p_l32gcc) \ + dh_gencontrol -p$(p_l32gcc) -p$(p_l32gccdbg) \ -- -v$(DEB_VERSION) $(common_substvars) b=libgcc; v=$(GCC_SONAME); \ for ext in preinst postinst prerm postrm; do \ @@ -156,9 +169,9 @@ cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \ fi; \ done - dh_installdeb -p$(p_l32gcc) - dh_md5sums -p$(p_l32gcc) - dh_builddeb -p$(p_l32gcc) + dh_installdeb -p$(p_l32gcc) -p$(p_l32gccdbg) + dh_md5sums -p$(p_l32gcc) -p$(p_l32gccdbg) + dh_builddeb -p$(p_l32gcc) -p$(p_l32gccdbg) trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp) @@ -169,7 +182,7 @@ dh_testroot mv $(install_stamp) $(install_stamp)-tmp - rm -rf $(d_ln32gcc) + rm -rf $(d_ln32gcc) $(d_ln32gccdbg) dh_installdirs -p$(p_ln32gcc) \ $(docdir)/$(p_ln32gcc) \ $(PF)/$(DEB_TARGET_GNU_TYPE)/$(libn32) @@ -178,15 +191,15 @@ mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libn32)/libgcc_s.so.$(GCC_SONAME) $(d_ln32gcc)/$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libn32)/. endif - dh_installdocs -p$(p_ln32gcc) - dh_installchangelogs -p$(p_ln32gcc) - + debian/dh_doclink -p$(p_ln32gcc) $(p_base) + debian/dh_doclink -p$(p_ln32gccdbg) $(p_base) debian/dh_rmemptydirs -p$(p_ln32gcc) - PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_ln32gcc) - dh_compress -p$(p_ln32gcc) - dh_fixperms -p$(p_ln32gcc) + debian/dh_rmemptydirs -p$(p_ln32gccdbg) + PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_ln32gcc) --dbg-package=$(p_ln32gccdbg) + dh_compress -p$(p_ln32gcc) -p$(p_ln32gccdbg) + dh_fixperms -p$(p_ln32gcc) -p$(p_ln32gccdbg) ifeq ($(with_shared_libgcc),yes) - dh_makeshlibs -p$(p_ln32gcc) -n + dh_makeshlibs -p$(p_ln32gcc) -p$(p_ln32gccdbg) -n sed s/$(cross_lib_arch)//g < debian/$(p_ln32gcc)/DEBIAN/shlibs > debian/$(p_ln32gcc)/DEBIAN/shlibs.fixed mv debian/$(p_ln32gcc)/DEBIAN/shlibs.fixed debian/$(p_ln32gcc)/DEBIAN/shlibs cat debian/$(p_ln32gcc)/DEBIAN/shlibs >> debian/shlibs.local @@ -194,7 +207,7 @@ ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_ln32gcc) sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_ln32gcc).substvars > debian/$(p_ln32gcc).substvars.new mv debian/$(p_ln32gcc).substvars.new debian/$(p_ln32gcc).substvars - dh_gencontrol -p$(p_ln32gcc) \ + dh_gencontrol -p$(p_ln32gcc) -p$(p_ln32gccdbg) \ -- -v$(DEB_VERSION) $(common_substvars) b=libgcc; v=$(GCC_SONAME); \ for ext in preinst postinst prerm postrm; do \ @@ -202,9 +215,9 @@ cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \ fi; \ done - dh_installdeb -p$(p_ln32gcc) - dh_md5sums -p$(p_ln32gcc) - dh_builddeb -p$(p_ln32gcc) + dh_installdeb -p$(p_ln32gcc) -p$(p_ln32gccdbg) + dh_md5sums -p$(p_ln32gcc) -p$(p_ln32gccdbg) + dh_builddeb -p$(p_ln32gcc) -p$(p_ln32gccdbg) trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)