[DRE-maint] [DRE-commits] r2484 - in tools/ruby-pkg-tools/trunk: 1/class debian
Lucas Nussbaum
lucas at lucas-nussbaum.net
Thu Feb 14 00:34:09 UTC 2008
Hi,
I really would like some feedback on this change. I'm not totally sure
of which packages it could break.
Without that change, librmagick-ruby doesn't clean it's build dir
properly (the upstream author uses a 'post-clean' hook).
Lucas
On 14/02/08 at 00:24 +0000, lucas at alioth.debian.org wrote:
> Author: lucas
> Date: 2008-02-14 00:24:00 +0000 (Thu, 14 Feb 2008)
> New Revision: 2484
>
> Modified:
> tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
> tools/ruby-pkg-tools/trunk/debian/changelog
> Log:
> run both clean and distclean, not just distclean
>
> Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
> ===================================================================
> --- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk 2008-02-13 22:57:12 UTC (rev 2483)
> +++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk 2008-02-14 00:24:00 UTC (rev 2484)
> @@ -37,7 +37,6 @@
> PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb
> DEB_RUBY_SETUP_CMD = debian-setup.rb
> DEB_RUBY_CONFIG_ARGS = --installdirs=std
> -DEB_RUBY_CLEAN_TARGET = distclean
>
> # command to install symlink to packaged setup.rb: used in both build and clean
> # targets
> @@ -70,7 +69,8 @@
> cd $(DEB_SRCDIR)
> $(DEB_RUBY_INSTALL_SETUP_CMD)
> /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
> - /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_CLEAN_TARGET)
> + /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) clean
> + /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) distclean
> /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
> /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) setup
> /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg)
> @@ -86,7 +86,8 @@
> clean::
> $(DEB_RUBY_INSTALL_SETUP_CMD)
> /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
> - /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_CLEAN_TARGET)
> + /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) clean
> + /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) distclean
> rm -f $(DEB_SRCDIR)/.config-*
> $(DEB_RUBY_REMOVE_SETUP_CMD)
>
>
> Modified: tools/ruby-pkg-tools/trunk/debian/changelog
> ===================================================================
> --- tools/ruby-pkg-tools/trunk/debian/changelog 2008-02-13 22:57:12 UTC (rev 2483)
> +++ tools/ruby-pkg-tools/trunk/debian/changelog 2008-02-14 00:24:00 UTC (rev 2484)
> @@ -1,8 +1,11 @@
> ruby-pkg-tools (0.14) UNRELEASED; urgency=low
>
> - * NOT RELEASED YET
> + * Invoke both "setup.rb clean" and "setup.rb distclean". Some extensions
> + might clean up in distclean, others in clean, so there's no unique
> + solution. Fixes a double-build failure
> + with librmagick-ruby 2.2.2.
>
> - -- Lucas Nussbaum <lucas at lucas-nussbaum.net> Wed, 13 Feb 2008 00:06:19 +0100
> + -- Lucas Nussbaum <lucas at lucas-nussbaum.net> Thu, 14 Feb 2008 01:22:39 +0100
>
> ruby-pkg-tools (0.13) unstable; urgency=low
>
>
>
> _______________________________________________
> Pkg-ruby-extras-commits mailing list
> Pkg-ruby-extras-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/pkg-ruby-extras-commits
>
--
| Lucas Nussbaum
| lucas at lucas-nussbaum.net http://www.lucas-nussbaum.net/ |
| jabber: lucas at nussbaum.fr GPG: 1024D/023B3F4F |
More information about the Pkg-ruby-extras-maintainers
mailing list