diff -Nru mingw-w64-libjpeg-6b/debian/changelog mingw-w64-libjpeg-6b/debian/changelog --- mingw-w64-libjpeg-6b/debian/changelog 2009-09-19 21:01:14.000000000 +0100 +++ mingw-w64-libjpeg-6b/debian/changelog 2009-12-21 12:45:12.000000000 +0000 @@ -1,3 +1,27 @@ +mingw-w64-libjpeg (6b-0clazzes4~jaunty1) jaunty; urgency=medium + + * Upload to clazzes.org PPA for jaunty. + + -- Wolfgang Glas (ev-i Informationstechnologie GmbH) Mon, 21 Dec 2009 13:45:12 +0100 + +mingw-w64-libjpeg (6b-0clazzes4~hardy1) hardy; urgency=medium + + * Upload to clazzes.org PPA for hardy. + + -- Wolfgang Glas (ev-i Informationstechnologie GmbH) Mon, 21 Dec 2009 13:45:10 +0100 + +mingw-w64-libjpeg (6b-0clazzes4~karmic1) karmic; urgency=medium + + * Upload to clazzes.org PPA for karmic. + + -- Wolfgang Glas (ev-i Informationstechnologie GmbH) Fri, 04 Dec 2009 14:56:14 +0100 + +mingw-w64-libjpeg (6b-0clazzes4) any; urgency=medium + + * Add ming-w32-i586 build. + + -- Wolfgang Glas (ev-i Informationstechnologie GmbH) Sat, 14 Nov 2009 20:53:32 +0100 + mingw-w64-libjpeg (6b-0clazzes3~jaunty1) jaunty; urgency=medium * Upload to clazzes.org PPA for jaunty. diff -Nru mingw-w64-libjpeg-6b/debian/control mingw-w64-libjpeg-6b/debian/control --- mingw-w64-libjpeg-6b/debian/control 2009-09-07 11:07:37.000000000 +0100 +++ mingw-w64-libjpeg-6b/debian/control 2009-11-14 19:55:11.000000000 +0000 @@ -2,7 +2,7 @@ Priority: extra Section: devel Maintainer: Wolfgang Glas -Build-Depends: cdbs, debhelper (>> 5), mingw-w32-libpng, mingw-w64-libpng +Build-Depends: cdbs, debhelper (>> 5), mingw-w32-libpng, mingw-w32-i586-libpng, mingw-w64-libpng Package: mingw-w64-libjpeg Architecture: any @@ -13,3 +13,8 @@ Architecture: any Depends: mingw-w32-libpng Description: This is the libjpeg port to mingw-w32. + +Package: mingw-w32-i586-libjpeg +Architecture: any +Depends: mingw-w32-i586-libpng +Description: This is the libjpeg port to i586 compatible mingw-w32. diff -Nru mingw-w64-libjpeg-6b/debian/rules mingw-w64-libjpeg-6b/debian/rules --- mingw-w64-libjpeg-6b/debian/rules 2009-09-07 12:56:09.000000000 +0100 +++ mingw-w64-libjpeg-6b/debian/rules 2009-11-14 19:52:02.000000000 +0000 @@ -18,6 +18,13 @@ builddir32 = build32 DESTDIR32 = $(shell /bin/pwd)/debian/$(package32) +package32o = mingw-w32-i586-libjpeg +target32o = i586-pc-mingw32 +prefix32o = /usr/$(target32o) +docdir32o = debian/$(package32)/usr/share/doc/$(package32o) +builddir32o = build32o +DESTDIR32o = $(shell /bin/pwd)/debian/$(package32o) + DEB_INSTALL_DOCS_ALL := src/README DEB_SHLIBDEPS_INCLUDE := @@ -40,6 +47,10 @@ mkdir $(builddir32) cd $(builddir32) && CC=$(target32)-gcc CXX=$(target32)-g++ ../src/configure --host=$(target32) --prefix=$(prefix32) --enable-shared --disable-static cd $(builddir32) && make all + rm -rf $(builddir32o) + mkdir $(builddir32o) + cd $(builddir32o) && CC='$(target32)-gcc -march=i586' CXX='$(target32)-g++ -march=i586' ../src/configure --host=$(target32o) --prefix=$(prefix32o) --enable-shared --disable-static + cd $(builddir32o) && make all touch common-build-arch clean:: @@ -47,6 +58,7 @@ rm -rf *~ debian/$(package) debian/$(package32) debian/*~ debian/files* debian/substvars debian/compat rm -rf $(builddir) rm -rf $(builddir32) + rm -rf $(builddir32o) # # info pages, locale data and static libraries may conflict with @@ -60,4 +72,7 @@ rm -rf debian/$(package32) mkdir debian/$(package32) cd $(builddir32) && make DESTDIR=$(DESTDIR32) install + rm -rf debian/$(package32o) + mkdir debian/$(package32o) + cd $(builddir32o) && make DESTDIR=$(DESTDIR32o) install touch common-install-arch