diff -Nru squeak-vm-4.10.2.2614/debian/changelog squeak-vm-4.10.2.2614/debian/changelog --- squeak-vm-4.10.2.2614/debian/changelog 2015-01-24 23:27:13.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/changelog 2015-11-09 09:24:53.000000000 +0000 @@ -1,12 +1,52 @@ -squeak-vm (1:4.10.2.2614-1.1ubuntu1) vivid; urgency=low +squeak-vm (1:4.10.2.2614-4) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - debian/patches/avoid_embedded_libs.patch: - + Adapt for ld --as-needed. (Closes: #710367) - - debian/patches/pcre-compat.patch: - + Adapt to new libpcre api. (Closes: #710375) + * Fix use system shared config.guess and config.sub (not old local + versions). + Closes: bug#804164. Thanks to Jurica Stanojkovic. + + -- Jonas Smedegaard Mon, 09 Nov 2015 10:24:52 +0100 + +squeak-vm (1:4.10.2.2614-3) unstable; urgency=medium + + * Gix stop build-depend on libgstreamer0.10-dev: Plugin isn't built + anyway. + Closes: Bug#799726. Thanks to Moritz Muehlenhoff and Tobias Pape. + + -- Jonas Smedegaard Wed, 28 Oct 2015 17:34:33 +0100 + +squeak-vm (1:4.10.2.2614-2) unstable; urgency=medium + + * Update README.source to emphasize that control.in file is *not* a + show-stopper for contributions. + * Move packaging to pkg-squeak team governance. + * Declare compliance with Debian Policy 3.9.6. + * Improve short and long description, avoiding article in short + description, and referencing Debian packages (not web pages) for + Squeak images. + * Modernize CDBS use: + + Have utils.mk put aside cruft during build. + Tighten to build-depend on recent cdbs. + + Stop needlessly relax upstream-tarball.mk inclusion. + + Include cmake.mk (bypassing upstream configure script): Enables + fortifying options. + * Fix menu file. + * Recommend scratch with etoys as fallback (and stop suggest etoys). + Closes: bug#603797. Thanks to Ronny Standtke. + * Remove /usr/share/squeak dir when purging package. + Closes: Bug#658108. Thanks to Andreas Beckmann. + * Fix drop Education tag from desktop file. + Closes: Bug#611115. Thanks to Chris Wilson. + * Fix FTBFS with build-flag --as-needed. + Closes: Bug#710367. Thanks to Julian Taylor. + * Fix build-depend on libasound2-dev only on Linux archs, and + build-exclude it elsewhere. + Closes: Bug#696606. Thanks to Steven Chamberlain. + * Fix disable FFIPrims plugin on powerpcspe. + Closes: Bug#693633. Thanks to Roland Stigge. + * Add patch to fix FTBFS with clang. + Closes: bug#740972. Thanks to Nicolas Sévelin-Radiguet. - -- Artur Rona Sun, 25 Jan 2015 00:25:28 +0100 + -- Jonas Smedegaard Tue, 21 Jul 2015 20:02:34 +0200 squeak-vm (1:4.10.2.2614-1.1) unstable; urgency=medium @@ -16,19 +56,6 @@ -- Ondřej Surý Mon, 29 Sep 2014 17:06:04 +0200 -squeak-vm (1:4.10.2.2614-1ubuntu2) saucy; urgency=low - - * pcre-compat.patch: adapt to new libpcre api - - -- Julian Taylor Sun, 11 Aug 2013 21:46:58 +0200 - -squeak-vm (1:4.10.2.2614-1ubuntu1) saucy; urgency=low - - * Merge from Debian unstable (LP: #1009080), Remaining changes: - - adapted avoid_embedded_libs.patch for ld --as-needed - - -- Julian Taylor Thu, 30 May 2013 11:44:38 +0200 - squeak-vm (1:4.10.2.2614-1) unstable; urgency=low [ upstream ] @@ -95,13 +122,6 @@ -- Jonas Smedegaard Tue, 25 Dec 2012 18:37:50 +0100 -squeak-vm (1:4.4.7.2357-1.1ubuntu1) precise; urgency=low - - * Back out remove-embedded-pcre.diff for now, as it breaks - with ld --as-needed, and we're two days before release. - - -- Adam Conrad Tue, 24 Apr 2012 10:50:19 -0600 - squeak-vm (1:4.4.7.2357-1.1) unstable; urgency=low [ Hector Oron ] diff -Nru squeak-vm-4.10.2.2614/debian/control squeak-vm-4.10.2.2614/debian/control --- squeak-vm-4.10.2.2614/debian/control 2014-10-11 16:52:24.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/control 2015-10-28 16:07:20.000000000 +0000 @@ -1,18 +1,17 @@ Source: squeak-vm Section: interpreters Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Squeak Team +Maintainer: Debian Squeak Team Uploaders: Jonas Smedegaard , José L. Redrejo Rodríguez -Build-Depends: cdbs, +Build-Depends: cdbs (>= 0.4.106~), autotools-dev, debhelper, dh-buildinfo, cmake, libxt-dev, libgl1-mesa-dev, - libasound2-dev, + libasound2-dev [linux-any], uuid-dev, libspeex-dev, libxtst-dev, @@ -20,7 +19,6 @@ sharutils, libffi-dev, libdbus-1-dev, - libgstreamer0.10-dev, libvorbis-dev, libfreetype6-dev, libpango1.0-dev, @@ -28,10 +26,11 @@ libpulse-dev, libjpeg-dev, libpcre3-dev -Standards-Version: 3.9.4 +Build-Conflicts: libasound2-dev [!linux-any] +Standards-Version: 3.9.6 Homepage: http://www.squeakvm.org/unix/ -Vcs-Git: git://git.debian.org/git/collab-maint/squeak-vm -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/squeak-vm.git +Vcs-Git: git://anonscm.debian.org/pkg-squeak/squeak-vm +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-squeak/squeak-vm.git Package: squeak-vm Architecture: any @@ -40,15 +39,12 @@ whiptail, xterm | x-terminal-emulator, gettext-base -Recommends: zenity | kdebase-bin -Suggests: etoys -Description: The Squeak Smalltalk System (virtual machine) +Recommends: zenity | kdebase-bin, scratch | etoys +Description: Unix Squeak virtual machine Squeak is a full-featured implementation of the Smalltalk programming language and environment based on (and largely compatible with) the original Smalltalk-80 system. . - This package contains just the Squeak virtual machine. If you are new - to Squeak then you will have to install a Squeak image too before you - can run Squeak. Squeak images can be downloaded from - , or - . + This package contains just the Unix Squeak virtual machine. You will + likely need also an image file containing a "snapshot" of a live Squeak + session - e.g. one of the Debian packages etoys or scratch. diff -Nru squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch --- squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch 2014-10-11 16:52:24.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/avoid_embedded_libs.patch 2015-07-21 17:04:40.000000000 +0000 @@ -1,7 +1,10 @@ Description: Link against system shared PCRE and JPEG libraries - ubuntu: adapted for ld --as-needed -> #710367 Author: Neil Williams +Author: Julian Taylor Bug-Debian: http://bugs.debian.org/634240 +Bug-Debian: http://bugs.debian.org/710367 +Last-Update: 2015-07-21 + --- a/unix/CMakeLists.txt +++ b/unix/CMakeLists.txt @@ -117,10 +117,17 @@ diff -Nru squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch --- squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch 1970-01-01 00:00:00.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/clang_FTBFS_Wreturn-type.patch 2015-07-21 17:17:57.000000000 +0000 @@ -0,0 +1,18 @@ +Description: fix FTBFS with clang instead of gcc +Author: Nicolas Sévelin-Radiguet +Last-Update: 2014-03-06 +--- a/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c ++++ b/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c +@@ -995,10 +995,10 @@ + static sqInt sound_StopRecording(void) { + DBGMSG(">sound_StopRecording()"); + +- if (!audioIn.open) return; ++ if (!audioIn.open) return 0; + audioIn.open = false; + +- if (NULL == audioIn.pa_conn) return; ++ if (NULL == audioIn.pa_conn) return 1; + + ioThreadStall(&audioIn); + diff -Nru squeak-vm-4.10.2.2614/debian/patches/pcre-compat.patch squeak-vm-4.10.2.2614/debian/patches/pcre-compat.patch --- squeak-vm-4.10.2.2614/debian/patches/pcre-compat.patch 2013-08-11 19:48:04.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/pcre-compat.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Description: adapt to new pcre api - pcre_info is removed in favor of pcre_fullinfo -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=710375 -Author: Julian Taylor ---- a/unix/src/vm/intplugins/RePlugin/RePlugin.c -+++ b/unix/src/vm/intplugins/RePlugin/RePlugin.c -@@ -348,10 +348,13 @@ - - EXPORT(sqInt) primPCRENumSubPatterns(void) { - /* begin loadRcvrFromStackAt: */ -+ int ncap; -+ pcre_fullinfo((const pcre *)pcrePtr, NULL, -+ PCRE_INFO_CAPTURECOUNT, &ncap); - rcvr = interpreterProxy->stackObjectValue(0); - pcrePtr = ((int) (interpreterProxy->fetchArrayofObject(2, rcvr))); - interpreterProxy->pop(1); -- interpreterProxy->pushInteger(pcre_info((pcre *)pcrePtr, NULL, NULL)); -+ interpreterProxy->pushInteger(ncap); - } - - diff -Nru squeak-vm-4.10.2.2614/debian/patches/series squeak-vm-4.10.2.2614/debian/patches/series --- squeak-vm-4.10.2.2614/debian/patches/series 2014-10-11 16:52:24.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/patches/series 2015-07-21 17:18:56.000000000 +0000 @@ -3,4 +3,4 @@ #npsqueak.patch avoid_embedded_libs.patch fix_printf_syntax.patch -pcre-compat.patch +clang_FTBFS_Wreturn-type.patch diff -Nru squeak-vm-4.10.2.2614/debian/postrm squeak-vm-4.10.2.2614/debian/postrm --- squeak-vm-4.10.2.2614/debian/postrm 1970-01-01 00:00:00.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/postrm 2015-07-21 16:51:27.000000000 +0000 @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +case "$1" in + purge) + rm -rf /usr/share/squeak + ;; +esac + +#DEBHELPER# + +exit 0 diff -Nru squeak-vm-4.10.2.2614/debian/README.source squeak-vm-4.10.2.2614/debian/README.source --- squeak-vm-4.10.2.2614/debian/README.source 2014-10-11 16:52:24.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/README.source 2015-04-23 16:25:24.000000000 +0000 @@ -1,9 +1,11 @@ CDBS+git-buildpackage --------------------- -This source package uses CDBS and git-buildpackage. +This source package uses CDBS and git-buildpackage. NMUs need not (but +are encouraged to) make special use of these tools. In particular, the +debian/control.in file can be completely ignored. More info here: http://wiki.debian.org/CDBS+git-buildpackage - -- Jonas Smedegaard Wed, 14 Nov 2012 18:34:55 +0100 + -- Jonas Smedegaard Mon, 18 Feb 2013 12:55:37 +0100 diff -Nru squeak-vm-4.10.2.2614/debian/rules squeak-vm-4.10.2.2614/debian/rules --- squeak-vm-4.10.2.2614/debian/rules 2014-10-11 16:52:24.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/rules 2015-11-09 09:22:44.000000000 +0000 @@ -6,9 +6,10 @@ # This has to be exported to make some magic below work. export DH_OPTIONS --include /usr/share/cdbs/1/rules/upstream-tarball.mk -include /usr/share/cdbs/1/class/makefile.mk +include /usr/share/cdbs/1/rules/upstream-tarball.mk +include /usr/share/cdbs/1/class/cmake.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk pkg = $(DEB_SOURCE_PACKAGE) @@ -17,7 +18,8 @@ DEB_UPSTREAM_TARBALL_MD5 = 8a5cb1d6899d55df56154fab8716e034 # Put aside convenience code copies during build -upstream-cruft = Cross/plugins/RePlugin/pcre.c Cross/plugins/RePlugin/pcre.h +DEB_UPSTREAM_CRUFT_MOVE = Cross/plugins/RePlugin/pcre.c \ + Cross/plugins/RePlugin/pcre.h # all j*.[ch] except jmemd*.c and jinclude.h jpegfiles = jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jpegfiles += jchuff.c jchuff.h jcinit.c jcmainct.c jcmarker.c jcmaster.c @@ -30,66 +32,40 @@ jpegfiles += jidctflt.c jidctfst.c jidctint.c jidctred.c jmemmgr.c jpegfiles += jmemnobs.c jmemsys.h jmorecfg.h jpegint.h jpeglib.h jpegfiles += jquant1.c jquant2.c jutils.c jversion.h -upstream-cruft += $(patsubst %,Cross/plugins/JPEGReadWriter2Plugin/%,$(jpegfiles)) -pre-build:: debian/stamp-upstream-cruft -debian/stamp-upstream-cruft: - mkdir -p debian/upstream-cruft - @for orig in $(upstream-cruft); do \ - backup="debian/upstream-cruft/$$orig"; \ - [ ! -e "$$orig" ] || [ -e "$$backup" ] || { \ - mkdir -p "$$(dirname "$$backup")"; \ - echo mv "$$orig" "$$backup"; \ - mv "$$orig" "$$backup"; \ - }; \ - done - touch $@ -clean:: - @for orig in $(upstream-cruft); do \ - backup="debian/upstream-cruft/$$orig"; \ - if [ -e "$$backup" ]; then \ - if [ -e "$$orig" ]; then \ - echo "rm -rf" "$$orig"; \ - rm -rf "$$orig"; \ - fi; \ - echo mv "$$backup" "$$orig"; \ - mv "$$backup" "$$orig"; \ - fi; \ - done - rm -rf debian/upstream-cruft - rm -f debian/stamp-upstream-cruft +DEB_UPSTREAM_CRUFT_MOVE += \ + $(patsubst %,Cross/plugins/JPEGReadWriter2Plugin/%,$(jpegfiles)) DEB_SRCDIR = unix DEB_BUILDDIR = build-tree DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(cdbs_curdestdir) -CMAKE_OPTS = -Wno-dev -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_SKIP_RPATH=TRUE -D BINDINGS_GLOBAL_INSTALL=TRUE -D PEDANTIC=TRUE ifneq ($(DEB_HOST_ARCH),i386) CONFIG_OPTS=--without-RomePlugin --without-Mpeg3Plugin endif +# FFIPrims plugin uses assembler code unsupported on powerpcspe +ifeq ($(DEB_HOST_ARCH),powerpcspe) + CONFIG_OPTS=--without-SqueakFFIPrims +endif + +vmmversion = $(basename $(DEB_UPSTREAM_TARBALL_VERSION)) +svnversion = $(subst .,,$(suffix $(DEB_UPSTREAM_TARBALL_VERSION))) +guess := $(shell /usr/share/misc/config.guess) +sub := $(shell /usr/share/misc/config.sub $(guess)) +DEB_CMAKE_EXTRA_FLAGS += -DVM_HOST=$(sub) +DEB_CMAKE_EXTRA_FLAGS += -DVM_VERSION=$(vmmversion)-$(svnversion) +DEB_CMAKE_EXTRA_FLAGS += -DPLATFORM_SOURCE_VERSION=$(svnversion) +DEB_CMAKE_EXTRA_FLAGS += -DOPT--prefix=$(DEB_CMAKE_INSTALL_PREFIX) +CONFIG_OPTS += --with-npsqueak +DEB_CMAKE_EXTRA_FLAGS += $(patsubst %,-DOPT%=1,$(CONFIG_OPTS)) + # Upstream README contains no parts relevant for Debian usage DEB_INSTALL_DOCS_ALL = DEB_INSTALL_CHANGELOGS_ALL = unix/ChangeLog DEB_INSTALL_MANPAGES_$(pkg) = debian/squeak.1 -common-configure-arch:: configure-stamp -configure-stamp: - # Perform an out-of-tree build to keep a clean source tree - cd $(DEB_BUILDDIR); $(CURDIR)/$(DEB_SRCDIR)/cmake/configure $(CONFIG_OPTS) \ - --with-npsqueak --prefix=/usr - cd $(DEB_BUILDDIR); cmake .. \ - -DCMAKE_INSTALL_PREFIX:STRING="/usr" \ - -DCMAKE_C_FLAGS:STRING="$(CFLAGS)" \ - $(CURDIR)/$(DEB_SRCDIR) - - touch $@ - -clean:: - rm -f configure-stamp - rm -rf $(DEB_BUILDDIR) - install/$(pkg):: for y in debian/po/*.po; do \ i=`basename $$y .po`; \ diff -Nru squeak-vm-4.10.2.2614/debian/squeak.desktop squeak-vm-4.10.2.2614/debian/squeak.desktop --- squeak-vm-4.10.2.2614/debian/squeak.desktop 2014-10-11 16:52:24.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/squeak.desktop 2015-07-21 16:55:30.000000000 +0000 @@ -11,5 +11,5 @@ Comment= Programming system and content development tool Comment[es_ES]=Herramienta de desarrollo de contenidos y aplicaciones Comment[de_DE]=Programmier- und Multimediaentwicklungsumgebung -Categories=Application;Education;Development; +Categories=Application;Development; MimeType=application/x-image;application/squeak-image;application/squeak-project diff -Nru squeak-vm-4.10.2.2614/debian/squeak.menu squeak-vm-4.10.2.2614/debian/squeak.menu --- squeak-vm-4.10.2.2614/debian/squeak.menu 2014-10-11 16:52:24.000000000 +0000 +++ squeak-vm-4.10.2.2614/debian/squeak.menu 2015-07-21 16:34:50.000000000 +0000 @@ -1,2 +1,2 @@ ?package(squeak):needs="X11" section="Apps/Programming"\ - title="Squeak" command="/usr/bin/squeak -install" icon="/usr/share/pixmaps/squeak-32.xpm" + title="Squeak" command="/usr/bin/squeak"