diff -Nru uwsgi-2.0.7/debian/changelog uwsgi-2.0.7/debian/changelog --- uwsgi-2.0.7/debian/changelog 2014-10-25 19:07:28.000000000 +0000 +++ uwsgi-2.0.7/debian/changelog 2015-09-15 00:56:45.000000000 +0000 @@ -1,3 +1,9 @@ +uwsgi (2.0.7-1+rpi1) stretch-staging; urgency=medium + + * Build for default ruby version only. + + -- Peter Michael Green Tue, 15 Sep 2015 00:56:37 +0000 + uwsgi (2.0.7-1) unstable; urgency=medium [ upstream ] diff -Nru uwsgi-2.0.7/debian/control uwsgi-2.0.7/debian/control --- uwsgi-2.0.7/debian/control 2014-10-25 19:06:53.000000000 +0000 +++ uwsgi-2.0.7/debian/control 2015-09-15 01:23:36.000000000 +0000 @@ -19,7 +19,7 @@ libldap2-dev, liblua5.1-0-dev, liblua5.2-dev, - libluajit-5.1-dev [amd64 armel armhf i386 kfreebsd-i386 mips mipsel powerpc], + libluajit-5.1-dev [none], libperl-dev, libpq-dev, libcurl4-openssl-dev, @@ -38,19 +38,19 @@ libwrap0-dev, libcoro-perl, libgeoip-dev, - libv8-dev [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel], + libv8-dev [none], libxslt1-dev, libcap-dev [linux-any], libmatheval-dev, libjail-dev [kfreebsd-any], libkvm-dev [kfreebsd-any], - librados-dev [amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x sparc], + librados-dev [none], libssl-dev, pkg-config, python-all-dev, - python-greenlet-dev [amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc], + python-greenlet-dev [none], python3-all-dev, - openjdk-7-jdk [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc], + openjdk-7-jdk [none], ruby-all-dev | ruby-dev, ruby, uuid-dev @@ -196,7 +196,7 @@ uwsgi-app-integration-plugins (= ${binary:Version}), uwsgi-plugin-rbthreads (= ${binary:Version}), uwsgi-plugin-fiber (= ${binary:Version}), - uwsgi-plugin-greenlet-python (= ${binary:Version}) [amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc], + uwsgi-plugin-greenlet-python (= ${binary:Version}) [none], Description: all available plugins for uWSGI uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. @@ -227,7 +227,7 @@ uwsgi-plugin-graylog2 (= ${binary:Version}), uwsgi-plugin-geoip (= ${binary:Version}), uwsgi-plugin-ldap (= ${binary:Version}), - uwsgi-plugin-rados (= ${binary:Version}) [amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x sparc], + uwsgi-plugin-rados (= ${binary:Version}) [none], uwsgi-plugin-router-access (= ${binary:Version}), uwsgi-plugin-sqlite3 (= ${binary:Version}), uwsgi-plugin-xslt (= ${binary:Version}) @@ -256,17 +256,17 @@ Package: uwsgi-app-integration-plugins Architecture: any Depends: ${misc:Depends}, - uwsgi-plugin-jvm-openjdk-7 (= ${binary:Version}) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc], - uwsgi-plugin-jwsgi-openjdk-7 (= ${binary:Version}) [amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc], + uwsgi-plugin-jvm-openjdk-7 (= ${binary:Version}) [none], + uwsgi-plugin-jwsgi-openjdk-7 (= ${binary:Version}) [none], uwsgi-plugin-lua5.1 (= ${binary:Version}), uwsgi-plugin-lua5.2 (= ${binary:Version}), - uwsgi-plugin-luajit (= ${binary:Version}) [amd64 armel armhf i386 kfreebsd-i386 mips mipsel powerpc], + uwsgi-plugin-luajit (= ${binary:Version}) [none], uwsgi-plugin-php (= ${binary:Version}), uwsgi-plugin-psgi (= ${binary:Version}), uwsgi-plugin-python (= ${binary:Version}), uwsgi-plugin-python3 (= ${binary:Version}), uwsgi-plugin-rack-${uwsgi:RubyKind} (= ${binary:Version}), - uwsgi-plugin-v8 (= ${binary:Version}) [amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel] + uwsgi-plugin-v8 (= ${binary:Version}) [none] Description: plugins for integration of uWSGI and application uWSGI presents a complete stack for networked/clustered web applications, implementing message/object passing, caching, RPC and process management. @@ -336,7 +336,7 @@ This package provides emperor_pg plugin for uWSGI. Package: uwsgi-plugin-rados -Architecture: amd64 arm64 armel armhf i386 mips mipsel powerpc ppc64el s390x sparc +Architecture: none Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}) Description: Ceph/RADOS storage plugin for uWSGI uWSGI presents a complete stack for networked/clustered web applications, @@ -402,7 +402,7 @@ This package provides graylog2 plugin for uWSGI. Package: uwsgi-plugin-greenlet-python -Architecture: amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc +Architecture: none Depends: ${shlibs:Depends}, ${misc:Depends}, python-greenlet, uwsgi-plugin-python (= ${binary:Version}) Description: greenlet plugin for uWSGI (Python 2) @@ -416,7 +416,7 @@ with Python 2 WSGI interface. Package: uwsgi-plugin-jvm-openjdk-7 -Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc +Architecture: none Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}), openjdk-7-jre-headless Description: Java plugin for uWSGI (OpenJDK 7) @@ -430,7 +430,7 @@ (linked with OpenJDK Java 7 runtime). Package: uwsgi-plugin-jwsgi-openjdk-7 -Architecture: amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64el s390x sparc +Architecture: none Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-plugin-jvm-openjdk-7 (= ${binary:Version}), openjdk-7-jre-headless Description: JWSGI plugin for uWSGI (OpenJDK 7) @@ -482,7 +482,7 @@ (linked with Lua 5.2 runtime). Package: uwsgi-plugin-luajit -Architecture: amd64 armel armhf i386 kfreebsd-i386 mips mipsel powerpc +Architecture: none Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}) Description: Lua WSAPI plugin for uWSGI (LuaJIT) uWSGI presents a complete stack for networked/clustered web applications, @@ -577,7 +577,7 @@ from SQLite 3 database. Package: uwsgi-plugin-v8 -Architecture: amd64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel +Architecture: none Depends: ${shlibs:Depends}, ${misc:Depends}, uwsgi-core (= ${binary:Version}) Description: JavaScript V8 plugin for uWSGI uWSGI presents a complete stack for networked/clustered web applications, diff -Nru uwsgi-2.0.7/debian/rules uwsgi-2.0.7/debian/rules --- uwsgi-2.0.7/debian/rules 2014-10-25 17:45:20.000000000 +0000 +++ uwsgi-2.0.7/debian/rules 2015-09-15 01:23:25.000000000 +0000 @@ -87,19 +87,22 @@ # TODO: simplify when ruby-all-dev is in stable # TODO: maybe simplify to call "dh_ruby --print-supported" when stable UWSGI_DEFAULTKIND_ruby := $(notdir $(shell readlink -f /usr/bin/ruby)) -UWSGI_KINDS_ruby := $(strip \ - $(if $(wildcard /usr/lib/ruby/vendor_ruby/ruby_debian_dev.rb),\ - $(shell ruby -rruby_debian_dev \ - -e 'include RubyDebianDev;' \ - -e 'SUPPORTED_RUBY_VERSIONS.select! do |version, binary|;' \ - -e 'puts version;' \ - -e 'end'),\ - $(UWSGI_DEFAULTKIND_ruby))) +#UWSGI_KINDS_ruby := $(strip \ +# $(if $(wildcard /usr/lib/ruby/vendor_ruby/ruby_debian_dev.rb),\ +# $(shell ruby -rruby_debian_dev \ +# -e 'include RubyDebianDev;' \ +# -e 'SUPPORTED_RUBY_VERSIONS.select! do |version, binary|;' \ +## -e 'puts version;' \ +# -e 'end'),\ +# $(UWSGI_DEFAULTKIND_ruby))) # TODO: support multiple Ruby kinds (requires dynamic control file sections) -UWSGI_KIND_ruby := $(UWSGI_KINDS_ruby)$(strip $(if $(strip \ - $(filter 1,$(words $(UWSGI_KINDS_ruby)))),\ - ,\ - $(error ERROR: multiple Ruby kinds not supported))) +UWSGI_KINDS_ruby := $(UWSGI_DEFAULTKIND_ruby) +#UWSGI_KIND_ruby := $(UWSGI_KINDS_ruby)$(strip $(if $(strip \ +# $(filter 1,$(words $(UWSGI_KINDS_ruby)))),\ +# ,\ +# $(error ERROR: multiple Ruby kinds not supported))) +UWSGI_KIND_ruby := $(UWSGI_DEFAULTKIND_ruby) + UWSGI_SRCPLUGINS_ruby = rack UWSGI_PLUGIN_PACKAGES = $(filter uwsgi-plugin-%,$(DEB_PACKAGES))