diff -Nru squeak-vm-4.4.7.2357/debian/changelog squeak-vm-4.4.7.2357/debian/changelog --- squeak-vm-4.4.7.2357/debian/changelog 2012-03-03 17:32:02.000000000 +0000 +++ squeak-vm-4.4.7.2357/debian/changelog 2012-10-27 15:37:52.000000000 +0100 @@ -1,3 +1,10 @@ +squeak-vm (1:4.4.7.2357-1.1+rpi1) wheezy-staging; urgency=low + + * Revert to using embedded libraries because using system + ones breaks JPEG support. + + -- Peter Michael Green Sat, 27 Oct 2012 15:36:26 +0100 + squeak-vm (1:4.4.7.2357-1.1) unstable; urgency=low [ Hector Oron ] diff -Nru squeak-vm-4.4.7.2357/debian/patches/series squeak-vm-4.4.7.2357/debian/patches/series --- squeak-vm-4.4.7.2357/debian/patches/series 2012-03-03 18:51:54.000000000 +0000 +++ squeak-vm-4.4.7.2357/debian/patches/series 2012-10-27 14:47:02.000000000 +0100 @@ -3,4 +3,4 @@ #npsqueak.patch linex.patch reenable-gcc-optimisations.patch -remove-embedded-pcre.diff +#remove-embedded-pcre.diff diff -Nru squeak-vm-4.4.7.2357/debian/rules squeak-vm-4.4.7.2357/debian/rules --- squeak-vm-4.4.7.2357/debian/rules 2012-03-03 20:17:59.000000000 +0000 +++ squeak-vm-4.4.7.2357/debian/rules 2012-10-27 15:35:33.000000000 +0100 @@ -53,10 +53,10 @@ #put svn version for the squeak lib directory: # echo $(svnversion)>unix/svnversion # Perform an out-of-tree build to keep a clean source tree - $(RM) Cross/plugins/RePlugin/pcre.c - $(RM) Cross/plugins/RePlugin/pcre.h - find Cross/plugins/JPEGReadWriter2Plugin/ -not -name 'jmemd*.c' -and -name 'j*.c' -delete - find Cross/plugins/JPEGReadWriter2Plugin/ -not -name 'jinclude.h' -and -name 'j*.h' -delete + #$(RM) Cross/plugins/RePlugin/pcre.c + #$(RM) Cross/plugins/RePlugin/pcre.h + #find Cross/plugins/JPEGReadWriter2Plugin/ -not -name 'jmemd*.c' -and -name 'j*.c' -delete + #find Cross/plugins/JPEGReadWriter2Plugin/ -not -name 'jinclude.h' -and -name 'j*.h' -delete mkdir $(BUILD_TREE) cd $(BUILD_TREE); ../unix/cmake/configure $(CONFIG_OPTS) \ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \