[DRE-commits] r2419 - in tools/ruby-pkg-tools/trunk: 1/class debian

acornet at alioth.debian.org acornet at alioth.debian.org
Sat Jan 12 23:15:36 UTC 2008


Author: acornet
Date: 2008-01-12 23:15:36 +0000 (Sat, 12 Jan 2008)
New Revision: 2419

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
Enforce use of libsetup-ruby1.8's setup.rb for all packages.

Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2008-01-11 20:05:13 UTC (rev 2418)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2008-01-12 23:15:36 UTC (rev 2419)
@@ -41,8 +41,22 @@
 
 # command to install symlink to packaged setup.rb: used in both build and clean
 # targets
-DEB_RUBY_INSTALL_SETUP_CMD = [ -f $(DEB_RUBY_SETUP_CMD) ] || ln -s $(PACKAGED_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD)
+DEB_RUBY_INSTALL_SETUP_CMD = \
+	if [ ! -L $(DEB_RUBY_SETUP_CMD) ] ; then \
+		if [ -f $(DEB_RUBY_SETUP_CMD) ] ; then \
+			mv $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+		fi ; \
+		ln -s $(PACKAGED_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD) ; \
+	fi
 
+DEB_RUBY_REMOVE_SETUP_CMD = \
+	if [ -L $(DEB_RUBY_SETUP_CMD) ] ; then \
+		rm $(DEB_RUBY_SETUP_CMD) ; \
+	fi ; \
+	if [ -f $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+		mv $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build $(DEB_RUBY_SETUP_CMD) ; \
+	fi
+
 # Build simple packages
 $(patsubst %,build/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: build/% :
 	$(DEB_RUBY_INSTALL_SETUP_CMD)
@@ -74,6 +88,6 @@
 	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS)
 	/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_CLEAN_TARGET)
 	rm -f $(DEB_SRCDIR)/.config-*
-	([ -L $(DEB_RUBY_SETUP_CMD) ] && rm -f $(DEB_RUBY_SETUP_CMD)) || true
+	$(DEB_RUBY_REMOVE_SETUP_CMD)
 
 endif

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2008-01-11 20:05:13 UTC (rev 2418)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2008-01-12 23:15:36 UTC (rev 2419)
@@ -25,8 +25,9 @@
   [ Arnaud Cornet ]
   * 1/class/ruby-setup-rb.mk: Add $(DEB_RUBY_INSTALL_SETUP_CMD) when building
     regular library packages.
+  * Enforce use of libsetup-ruby1.8's setup.rb for all packages.
 
- -- Antonio Terceiro <terceiro at softwarelivre.org>  Wed, 19 Dec 2007 20:01:51 -0300
+ -- Arnaud Cornet <acornet at debian.org>  Sun, 13 Jan 2008 00:14:58 +0100
 
 ruby-pkg-tools (0.12) unstable; urgency=low
 




More information about the Pkg-ruby-extras-commits mailing list