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

[terceiro-guest at alioth.debian.org]

Author: terceiro-guest
Date: 2008-01-14 13:24:15 +0000 (Mon, 14 Jan 2008)
New Revision: 2421

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
Using debian-setup.rb as the symlink name to packaged setup.rb



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-14 09:53:55 UTC (rev 2420)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2008-01-14 13:24:15 UTC (rev 2421)
@@ -35,7 +35,7 @@
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
 
 PACKAGED_RUBY_SETUP_CMD = /usr/lib/ruby/1.8/setup.rb
-DEB_RUBY_SETUP_CMD = setup.rb
+DEB_RUBY_SETUP_CMD = debian-setup.rb
 DEB_RUBY_CONFIG_ARGS = --installdirs=std
 DEB_RUBY_CLEAN_TARGET = distclean
 
@@ -43,18 +43,12 @@
 # targets
 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

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2008-01-14 09:53:55 UTC (rev 2420)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2008-01-14 13:24:15 UTC (rev 2421)
@@ -6,6 +6,13 @@
   * bin/pkg-ruby-get-sources: provide a better progress update information,
     compatible with narrow terminals (Closes: #422536)
   * debian/control: new maintainer name and address for myself
+  * 1/class/ruby-setup-rb.mk: installing a symbolic link to packaged setup.rb
+    in build directory root when maintainer wants to use setup.rb to build
+    the package. All packages shall be built using the packaged setup.rb,
+    event if it already provides one. This way we can e.g. fork setup.rb in
+    the future if Debian needs some modification in the build process.
+    Thanks to Gunnar Wolf for the idea and initial patch.
+  * debian/control: added depencency on libsetup-ruby1.8
 
   [ Stig Sandbeck Mathisen ]
   * Added myself to the team
@@ -15,19 +22,12 @@
   * fixed Vcs-*: point to dir containing debian/, not dir containing
     trunk/
 
-  [ Antonio Terceiro ]
-  * 1/class/ruby-setup-rb.mk: installing a symbolic link to packaged setup.rb
-    in build directory root when maintainer wants to use setup.rb but the
-    package does not provide one. Original idea and initial patch by
-    Gunnar Wolf.
-  * debian/control: added depencency on libsetup-ruby1.8
-
   [ 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.
 
- -- Arnaud Cornet <acornet at debian.org>  Sun, 13 Jan 2008 00:14:58 +0100
+ -- Antonio Terceiro <terceiro at softwarelivre.org>  Sun, 13 Jan 2008 00:49:10 -0300
 
 ruby-pkg-tools (0.12) unstable; urgency=low