diff -pruN 4.2.1.dfsg-2/debian/changelog 4.2.1.dfsg-2ubuntu1/debian/changelog --- 4.2.1.dfsg-2/debian/changelog 2010-06-18 12:40:17.000000000 +0100 +++ 4.2.1.dfsg-2ubuntu1/debian/changelog 2010-06-18 12:37:58.000000000 +0100 @@ -1,3 +1,12 @@ +mingw32 (4.2.1.dfsg-2ubuntu1) maverick; urgency=low + + * Merge with debian,remaining change + - Bump standards version + - Retain 01-shared-libgcc-libc++.patch + - Retain changes to rules file to build shared libgcc and libstdc++ libraries,add debian changes on top + + -- Rohan Garg Thu, 17 Jun 2010 04:19:56 +0530 + mingw32 (4.2.1.dfsg-2) unstable; urgency=low * Remedial math. @@ -5,6 +14,22 @@ mingw32 (4.2.1.dfsg-2) unstable; urgency -- Ron Lee Wed, 19 May 2010 00:32:40 +0930 +mingw32 (4.2.1.dfsg-1ubuntu2) lucid; urgency=low + + * Build shared libgcc and libstdc++ libraries (LP: #195407). + + -- Michael Hofmann Sun, 03 Jan 2010 02:24:27 +0100 + +mingw32 (4.2.1.dfsg-1ubuntu1) hardy; urgency=low + + * debian/rules: + - fixed bashsim (LP: #178264) + * debian/control: + - updated Maintainer field + - bumped Standards-Version to 3.7.3 + + -- Mario Bonino Sun, 23 Dec 2007 14:41:08 +0100 + mingw32 (4.2.1.dfsg-1) unstable; urgency=low * New upstream. Unfortunately this one was a monolithic blob made on a diff -pruN 4.2.1.dfsg-2/debian/control 4.2.1.dfsg-2ubuntu1/debian/control --- 4.2.1.dfsg-2/debian/control 2010-06-18 12:40:17.000000000 +0100 +++ 4.2.1.dfsg-2ubuntu1/debian/control 2010-06-18 12:37:58.000000000 +0100 @@ -2,7 +2,8 @@ Source: mingw32 Section: devel Priority: optional Build-Depends: mingw32-binutils, mingw32-runtime, debhelper (>= 4.0), gettext, bison, flex, perl, texinfo -Maintainer: Ron Lee +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ron Lee Standards-Version: 3.8.4.0 Package: mingw32 diff -pruN 4.2.1.dfsg-2/debian/patches/01-shared-libgcc-libc++.patch 4.2.1.dfsg-2ubuntu1/debian/patches/01-shared-libgcc-libc++.patch --- 4.2.1.dfsg-2/debian/patches/01-shared-libgcc-libc++.patch 1970-01-01 01:00:00.000000000 +0100 +++ 4.2.1.dfsg-2ubuntu1/debian/patches/01-shared-libgcc-libc++.patch 2010-06-18 12:37:58.000000000 +0100 @@ -0,0 +1,49 @@ +diff -ur gcc-4.2.1-2-dfsg/gcc/config/i386/t-mingw32 gcc-4.2.1-2-dfsg/gcc/config/i386/t-mingw32 +--- gcc-4.2.1-2-dfsg/gcc/config/i386/t-mingw32 2007-08-13 09:48:03.000000000 +0200 ++++ gcc-4.2.1-2-dfsg/gcc/config/i386/t-mingw32 2008-02-25 12:41:08.000000000 +0100 +@@ -5,15 +5,15 @@ + shared-libgcc: libgcc_s.a libgcc_sjlj_1.dll + libgcc_s.a libgcc_sjlj_1.dll: libgcc.a + cp -f libgcc.a libgcc_t.a +- $(AR) -d libgcc_t.a _chkstk.o _ctors.o +- dlltool --output-def libgcc_s.def --export-all libgcc_t.a ++ i586-mingw32msvc-ar -d libgcc_t.a _chkstk.o _ctors.o ++ i586-mingw32msvc-dlltool --output-def libgcc_s.def --export-all libgcc_t.a + $(GCC_FOR_TARGET) -shared -fno-exceptions -o libgcc_sjlj_1.dll -Wl,--out-implib,libgcc_s.a libgcc_s.def libgcc_t.a +- $(AR) -r libgcc_s.a libgcc/_chkstk.o libgcc/_ctors.o ++ i586-mingw32msvc-ar -r libgcc_s.a libgcc/_chkstk.o libgcc/_ctors.o + rm -f libgcc_t.a _chkstk.o _ctors.o libgcc_s.def + + install-shared-libgcc: installdirs shared-libgcc + $(INSTALL_DATA) libgcc_s.a $(DESTDIR)$(libsubdir)/ +- $(INSTALL_PROGRAM) libgcc_sjlj_1.dll $(DESTDIR)$(bindir)/ ++ $(INSTALL_DATA) libgcc_sjlj_1.dll $(DESTDIR)$(libsubdir)/ + + clean-shared-libgcc: + rm -f libgcc_s.a libgcc_sjlj_1.dll +diff -ur gcc-4.2.1-2-dfsg/libstdc++-v3/config/os/mingw32/x-mingw32 gcc-4.2.1-2-dfsg/libstdc++-v3/config/os/mingw32/x-mingw32 +--- gcc-4.2.1-2-dfsg/libstdc++-v3/config/os/mingw32/x-mingw32 2007-08-13 09:48:03.000000000 +0200 ++++ gcc-4.2.1-2-dfsg/libstdc++-v3/config/os/mingw32/x-mingw32 2008-02-25 12:43:58.000000000 +0100 +@@ -1,17 +1,17 @@ + shared-libstdc++: src/.libs/libstdc++_sjlj_6.dll src/.libs/libstdc++_s.a + src/.libs/libstdc++_sjlj_6.dll src/.libs/libstdc++_s.a: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) + cp -f src/.libs/libstdc++.a libstdc++_t.a +- ar -x libstdc++_t.a tinfo.o tinfo2.o +- ar -d libstdc++_t.a tinfo.o tinfo2.o +- dlltool --export-all --output-def=libstdc++.def libstdc++_t.a ++ i586-mingw32msvc-ar -x libstdc++_t.a tinfo.o tinfo2.o ++ i586-mingw32msvc-ar -d libstdc++_t.a tinfo.o tinfo2.o ++ i586-mingw32msvc-dlltool --export-all --output-def=libstdc++.def libstdc++_t.a + $(CC) -shared -shared-libgcc -o src/.libs/libstdc++_sjlj_6.dll -Wl,--out-implib,src/.libs/libstdc++_s.a \ + libstdc++.def src/.libs/libstdc++.a +- ar -rs src/.libs/libstdc++_s.a tinfo.o tinfo2.o ++ i586-mingw32msvc-ar -rs src/.libs/libstdc++_s.a tinfo.o tinfo2.o + rm -f libstdc++_t.a tinfo.o tinfo2.o + + install-shared-libstdc++: installdirs shared-libstdc++ + $(INSTALL_DATA) src/.libs/libstdc++_s.a $(DESTDIR)$(glibcxx_toolexeclibdir)/ +- $(INSTALL_PROGRAM) src/.libs/libstdc++_sjlj_6.dll $(DESTDIR)$(bindir)/ ++ $(INSTALL_DATA) src/.libs/libstdc++_sjlj_6.dll $(DESTDIR)$(glibcxx_toolexeclibdir)/ + + clean-shared-libstdc++: + rm -f src/.libs/libstdc++_sjlj_6.dll src/.libs/libstdc++_s.a diff -pruN 4.2.1.dfsg-2/debian/rules 4.2.1.dfsg-2ubuntu1/debian/rules --- 4.2.1.dfsg-2/debian/rules 2010-06-18 12:40:17.000000000 +0100 +++ 4.2.1.dfsg-2ubuntu1/debian/rules 2010-06-18 12:37:58.000000000 +0100 @@ -70,6 +70,16 @@ install-stamp : build-stamp && $(MAKE) install prefix=$(top_dir)/debian/$(package)/usr \ mandir=$(top_dir)/debian/$(package)/usr/share/man + cd $(build_objs) \ + && $(MAKE) install-shared-libgcc -C gcc \ + prefix=$(top_dir)/debian/$(package)/usr \ + mandir=$(top_dir)/debian/$(package)/usr/share/man + + cd $(build_objs) \ + && $(MAKE) install-shared-libstdc++ -C $(target)/libstdc++-v3 \ + prefix=$(top_dir)/debian/$(package)/usr \ + mandir=$(top_dir)/debian/$(package)/usr/share/man + # remove some non-cross stuff that will clash with other packages # and shuffle things about as required. rm -rf debian/$(package)/usr/include