[DRE-commits] r5839 - trunk/libgems-ruby/debian

[Lucas Nussbaum]

Author: lucas
Date: 2010-09-11 05:41:44 +0000 (Sat, 11 Sep 2010)
New Revision: 5839

Modified:
   trunk/libgems-ruby/debian/changelog
   trunk/libgems-ruby/debian/control
   trunk/libgems-ruby/debian/rules
Log:
Drop rubygems for 1.9.1, as it was moved to the ruby1.9.1 source package.

Modified: trunk/libgems-ruby/debian/changelog
===================================================================
--- trunk/libgems-ruby/debian/changelog	2010-09-09 19:48:09 UTC (rev 5838)
+++ trunk/libgems-ruby/debian/changelog	2010-09-11 05:41:44 UTC (rev 5839)
@@ -1,9 +1,10 @@
-libgems-ruby (1.3.7-2) stable; urgency=low
+libgems-ruby (1.3.7-2) unstable; urgency=low
 
   * debian/patches/20100829-ruby192_support.diff: Added a patch to support
     Ruby 1.9.2. (Closes: #588125)
+  * Drop rubygems for 1.9.1, as it was moved to the ruby1.9.1 source package.
 
- -- Daigo Moriwaki <daigo at debian.org>  Sun, 29 Aug 2010 11:24:39 +0900
+ -- Lucas Nussbaum <lucas at lucas-nussbaum.net>  Sat, 11 Sep 2010 07:41:09 +0200
 
 libgems-ruby (1.3.7-1) unstable; urgency=low
 

Modified: trunk/libgems-ruby/debian/control
===================================================================
--- trunk/libgems-ruby/debian/control	2010-09-09 19:48:09 UTC (rev 5838)
+++ trunk/libgems-ruby/debian/control	2010-09-11 05:41:44 UTC (rev 5839)
@@ -26,21 +26,6 @@
  .
  This package provides RubyGems with Ruby 1.8.
 
-Package: rubygems1.9.1
-Architecture: all
-Depends: ${misc:Depends}, ruby1.9.1, rdoc1.9.1
-Suggests: ruby1.9.1-dev, build-essential, rubygems-doc
-Description: package management framework for Ruby libraries/applications
- This is a way to package Ruby libraries/applications for distribution.
- RubyGems provides the ability to manage concurrent versions of libraries and
- dependencies between those libraries. Using RubyGems, you can:
-   * download and install Ruby libraries easily
-   * not worry about libraries A and B depending on different versions of
-     library C
-   * easily remove libraries you no longer use
- .
- This package provides RubyGems with Ruby 1.9.1.
-
 Package: rubygems
 Architecture: all
 Depends: ${misc:Depends}, rubygems1.8 (= ${binary:Version})

Modified: trunk/libgems-ruby/debian/rules
===================================================================
--- trunk/libgems-ruby/debian/rules	2010-09-09 19:48:09 UTC (rev 5838)
+++ trunk/libgems-ruby/debian/rules	2010-09-11 05:41:44 UTC (rev 5839)
@@ -6,18 +6,14 @@
 DEB_INSTALL_CHANGELOGS_ALL = ChangeLog debian/README.Debian
 
 RUBY18 = /usr/bin/ruby1.8
-RUBY19 = /usr/bin/ruby1.9.1
 RDOC = /usr/bin/rdoc1.8
 RUBY18LIBDIR = $(shell $(RUBY18) -rrbconfig -e "puts Config::CONFIG['rubylibdir']")
-RUBY19LIBDIR = $(shell $(RUBY19) -rrbconfig -e "puts Config::CONFIG['rubylibdir']")
 
 DEB_INSTALL_DOCS_rubygems-doc += html
 
 DEB_INSTALL_DIRS_rubygems1.8 += usr/bin/ usr/lib/ruby/1.8/  var/lib/gems/1.8/
-DEB_INSTALL_DIRS_rubygems1.9.1 += usr/bin/ usr/lib/ruby/1.9.1 var/lib/gems/1.9.1/
 
 DEB_INSTALL_MANPAGES_rubygems1.8 += debian/gem1.8.1
-DEB_INSTALL_MANPAGES_rubygems1.9.1 += debian/gem1.9.1.1
 
 clean::
 	rm -rf html
@@ -27,9 +23,6 @@
 build/rubygems1.8::
 	$(RUBY18) setup.rb --no-rdoc --no-ri --prefix=$(CURDIR)/debian/$(cdbs_curpkg)
 
-build/rubygems1.9.1::
-	$(RUBY19) setup.rb --no-rdoc --no-ri --prefix=$(CURDIR)/debian/$(cdbs_curpkg)
-
 build/rubygems-doc::
 	find lib -name "*.rb" | xargs $(RDOC) --fmt html --title RubyGems \
 	  --line-numbers --inline-source --main README -o html README
@@ -52,27 +45,3 @@
 	rm -rf $(CURDIR)/debian/$(cdbs_curpkg)/bin/
 	dh_install -p$(cdbs_curpkg)\
 	  debian/etc/bash_completion.d/gem1.8 etc/bash_completion.d/
-
-install/rubygems1.9.1::
-	find $(CURDIR)/debian/ -type f -name "*.in" | \
-	  while read fname; \
-	  do \
-	    sed -e 's/@@VERSION@@/1\.9\.1/g' -e 's/@@DOTLESS_VERSION@@/191/g' \
-		< $$fname > `expr $$fname : '\(.*\)\.in$$'`1.9.1; \
-	  done; \
-	  : \
-	done
-	mv $(CURDIR)/debian/gem1.9.1 $(CURDIR)/debian/gem1.9.1.1
-	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/$(RUBY19LIBDIR)/
-	mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/
-	mv $(CURDIR)/debian/$(cdbs_curpkg)/lib/* $(CURDIR)/debian/$(cdbs_curpkg)/$(RUBY19LIBDIR)/
-	rm $(CURDIR)/debian/$(cdbs_curpkg)/$(RUBY19LIBDIR)/rbconfig/datadir.rb
-	rm -rf $(CURDIR)/debian/$(cdbs_curpkg)/lib
-	mv $(CURDIR)/debian/$(cdbs_curpkg)/bin/gem1.9.1 $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/gem1.9.1
-	rm -rf $(CURDIR)/debian/$(cdbs_curpkg)/bin/
-	sh $(CURDIR)/debian/fixshebang.sh ruby1.9.1 \
-	  '$(CURDIR)/debian/$(cdbs_curpkg)/usr/bin'
-
-	dh_install -p$(cdbs_curpkg) \
-	  debian/etc/bash_completion.d/gem1.9.1 etc/bash_completion.d/
-