[DRE-commits] r2339 - in packages/libgems-ruby/trunk/debian: . etc etc/bash_completion.d patches

daigo at alioth.debian.org daigo at alioth.debian.org
Mon Dec 24 05:35:45 UTC 2007


Author: daigo
Date: 2007-12-24 05:35:44 +0000 (Mon, 24 Dec 2007)
New Revision: 2339

Added:
   packages/libgems-ruby/trunk/debian/etc/
   packages/libgems-ruby/trunk/debian/etc/bash_completion.d/
   packages/libgems-ruby/trunk/debian/etc/bash_completion.d/gem1.8
   packages/libgems-ruby/trunk/debian/gem1.8.1
   packages/libgems-ruby/trunk/debian/libgems-ruby1.8.dirs
   packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
   packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch
   packages/libgems-ruby/trunk/debian/postinst
   packages/libgems-ruby/trunk/debian/prerm
   packages/libgems-ruby/trunk/debian/rubygems.manpages
Removed:
   packages/libgems-ruby/trunk/debian/gem.1
   packages/libgems-ruby/trunk/debian/gem_mirror.1
   packages/libgems-ruby/trunk/debian/gem_server.sgml
   packages/libgems-ruby/trunk/debian/gemlock.1
   packages/libgems-ruby/trunk/debian/gemri.1
   packages/libgems-ruby/trunk/debian/gemwhich.sgml
   packages/libgems-ruby/trunk/debian/index_gem_repository.1
   packages/libgems-ruby/trunk/debian/patches/01_rubygems.dpatch
   packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch
   packages/libgems-ruby/trunk/debian/patches/03_config_file.dpatch
   packages/libgems-ruby/trunk/debian/patches/04_gem_runner.dpatch
   packages/libgems-ruby/trunk/debian/patches/06_dependency_list.dpatch
   packages/libgems-ruby/trunk/debian/patches/07_security.dpatch
   packages/libgems-ruby/trunk/debian/patches/10_datadir.dpatch
   packages/libgems-ruby/trunk/debian/patches/22_add_bash_completion.dpatch
   packages/libgems-ruby/trunk/debian/patches/90_opensuse_gem_commands.dpatch
   packages/libgems-ruby/trunk/debian/patches/91_opensuse_installer.dpatch
   packages/libgems-ruby/trunk/debian/patches/92_opensuse_gem_commands.dpatch
   packages/libgems-ruby/trunk/debian/patches/93_opensuse_installer.dpatch
Modified:
   packages/libgems-ruby/trunk/debian/changelog
   packages/libgems-ruby/trunk/debian/control
   packages/libgems-ruby/trunk/debian/libgems-ruby1.8.docs
   packages/libgems-ruby/trunk/debian/libgems-ruby1.8.install
   packages/libgems-ruby/trunk/debian/patches/00list
   packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch
   packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
   packages/libgems-ruby/trunk/debian/rubygems.install
   packages/libgems-ruby/trunk/debian/rules
Log:
Interim commit. Finished for Ruby 1.8.

Modified: packages/libgems-ruby/trunk/debian/changelog
===================================================================
--- packages/libgems-ruby/trunk/debian/changelog	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/changelog	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,12 +1,56 @@
-libgems-ruby (0.9.4-5) UNRELEASED; urgency=low
+libgems-ruby (1.0.0-1) unstable; urgency=low
 
   [ Daigo Moriwaki ]
-  * NOT RELEASED YET
+  * New upstream release (Closes: #45706, #45718, #443135).
+  * Removed patches since the upstream has resolved the issues
+    - debian/patches/03_config_file.dpatch
+    - debian/patches/04_gem_runner.dpatch
+    - debian/patches/06_dependency_list.dpatch
+    - debian/patches/07_security.dpatch
+    - debian/patches/10_datadir.dpatch
+  * Replaced patches with a new and upstream-friendly way.
+    Thanks to James Healy <jimmy at deefa dot com>.
+    - Removed debian/patches/01_rubygems.dpatch
+    - Removed debian/patches/02_post-install.dpatch
+    - Added debian/patches/01_default_gem_path.dpatch
+  * Removed patches for --build-root command option, which is no longer 
+    supported.
+    - 05_gem_commands.dpatch
+    - 09_installer.dpatch 
+  * debian/patches/08_tighter_search_regex.dpatch: Followed the upstream 
+    changes. Thanks to James Healy.
+  * Added debian/patches/03_disable_update_system.dpatch: 
+    Disabled gem update --system (Closes: #452547).
+    Thanks to James Healy. 
+  * debian/patches/21_avoid_ioseek.dpatch: Added a description.
+  * Added debian/etc/bash_completion.d/gem1.8 instread of patching
+    by debian/patches/22_add_bash_completion.dpatch 
+    - Improved a description. Thanks to James Healy.
+    - Followed new options. 
+      Thanks to Victor Serbin <chepel at hotmail dot com>.
+  * Removed man pages and corrected debian/rules since the commands 
+    are gone.
+    - deiban/gem_mirror.1
+    - deiban/gem_server.sgml
+    - deiban/gemlock.1, 
+    - deiban/gemri.1
+    - deiban/gemwhich.sgml
+    - deiban/index_gem_repository.1
+  * debian/libgems-ruby1.8.docs: Included 'html/' (instead of 'docs/') 
+    where documents are correctly generated. 'Releases' is no longer 
+    provided.
+  * Added debian/rubygems.manpages. Thanks to James Healy.
+  * debian/control:
+    - Added rake in Build-Depends-Indep to generate documentations.
+    - Removed unnecessary docbook-to-man from Build-Depends-Indep.
+    - Bumped Standards-Version to 3.7.3.
+  * Added debian/prerm and debian/postrm: /usr/bin/gem and gem1.8 are 
+    now managed by Debian alternatives system.
 
   [ Arnaud Cornet ]
   * Use new Homepage dpkg header.
 
- -- Arnaud Cornet <acornet at debian.org>  Wed, 24 Oct 2007 21:08:47 +0200
+ -- Daigo Moriwaki <daigo at debian.org>  Thu, 20 Dec 2007 20:03:53 +0900
 
 libgems-ruby (0.9.4-4) unstable; urgency=low
 

Modified: packages/libgems-ruby/trunk/debian/control
===================================================================
--- packages/libgems-ruby/trunk/debian/control	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/control	2007-12-24 05:35:44 UTC (rev 2339)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Daigo Moriwaki <daigo at debian.org>
 Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends-Indep: dpatch (>= 2.0.10), debhelper (>= 4.0.0), ruby1.8, docbook-to-man, ruby-pkg-tools
-Standards-Version: 3.7.2
+Build-Depends-Indep: dpatch (>= 2.0.10), debhelper (>= 4.0.0), ruby1.8, ruby-pkg-tools, rake
+Standards-Version: 3.7.3
 Homepage: http://rubygems.org/
 
 Package: libgems-ruby1.8

Added: packages/libgems-ruby/trunk/debian/etc/bash_completion.d/gem1.8
===================================================================
--- packages/libgems-ruby/trunk/debian/etc/bash_completion.d/gem1.8	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/etc/bash_completion.d/gem1.8	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1,297 @@
+# Michael Schuerig, michael at schuerig.de, 2007-02-24
+# [2007-12-21] Updated by Victor Serbin (chepel at hotmail.com) for gem v1.0
+# Free for all uses.
+
+have gem &&
+_gem()
+{
+    local cur prev completions
+
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    COMMANDS='build cert check cleanup contents dependency\
+      environment fetch generate_index help install list\
+      lock mirror outdated pristine query rdoc search server\
+      sources specification uninstall unpack update which'
+
+    GEM_OPTIONS='\
+      -h --help\
+      -v --version'
+
+    COMMON_OPTIONS='\
+      -h --help\
+      -V --verbose --no-verbose\
+      -q --quiet\
+      --config-file\
+      --backtrace\
+      --debug'
+
+    CERT_OPTIONS='\
+      -a -add\
+      -l --list\
+      -r --remove\
+      -b --build\
+      -C --certificate\
+      -K --private-key\
+      -s --sign'
+
+    CHECK_OPTIONS='\
+      --verify\
+      -a --alien\
+      -t --test\
+      -v --version'
+
+    CLEANUP_OPTIONS='\
+      -d --dry-run'
+
+    CONTENTS_OPTIONS='\
+      -v --version\
+      -s --spec-dir\
+      -l --lib-only --no-lib-only'
+
+    DEPENDENCY_OPTIONS='\
+      -v --version\
+      --platform\
+      -R --reverse-dependencies --no-reverse-dependencies\
+      -p --pipe'
+
+    ENVIRONMENT_OPTIONS=''
+
+    FETCH_OPTIONS='\
+      -v --version\
+      --platform\
+      -B --bulk-threshold\
+      -p --http-proxy --no-http-proxy\
+      --source'
+
+    GENERATE_INDEX_OPTIONS='\
+      -d --directory'
+
+    HELP_OPTIONS=$COMMANDS
+
+    INSTALL_OPTIONS='\
+      --platform\
+      -v --version\
+      -i --install-dir\
+      -d --rdoc --no-rdoc\
+      --ri --no-ri\
+      -E --env-shebang\
+      -f --force --no-force\
+      -t --test --no-test\
+      -w --wrappers --no-wrappers\
+      -P --trust-policy\
+      --ignore-dependencies\
+      -y --include-dependencies\
+      --format-executable --no-format-executable\
+      -l --local\
+      -r --remote\
+      -b --both\
+      -B --bulk-threshold\
+      --source\
+      -p --http-proxy --no-http-proxy\
+      -u --update-sources --no-update-sources'
+
+    LIST_OPTIONS='\
+      -d --details --no-details\
+      --versions --no-versions\
+      -l --local\
+      -r --remote\
+      -b --both\
+      -B --bulk-threshold\
+      --source\
+      -p --http-proxy --no-http-proxy\
+      -u --update-sources --no-update-sources'
+
+    LOCK_OPTIONS='\
+      -s --strict --no-strict'
+
+    MIRROR_OPTIONS=''
+
+    OUTDATED_OPTIONS='\
+      --platform'
+
+    PRISTINE_OPTIONS='\
+      --all\
+      -v --version'
+
+    QUERY_OPTIONS='\
+      -n --name-matches\
+      -d --details --no-details\
+      --versions --no-versions\
+      -l --local\
+      -r --remote\
+      -b --both\
+      -B --bulk-threshold\
+      --source\
+      -p --http-proxy --no-http-proxy\
+      -u --update-sources --no-update-sources'
+
+    RDOC_OPTIONS='\
+      --all\
+      --rdoc --no-rdoc\
+      --ri --no-ri\
+      -v --version'
+
+    SEARCH_OPTIONS='\
+      -d --details --no-details\
+      --versions --no-versions\
+      -l --local\
+      -r --remote\
+      -b --both\
+      -B --bulk-threshold\
+      --source\
+      -p --http-proxy --no-http-proxy\
+      -u --update-sources --no-update-sources'
+
+    SERVER_OPTIONS='\
+      -p --port\
+      -d --dir\
+      --daemon --no-daemon'
+
+    SOURCES_OPTIONS='\
+      -a --add\
+      -l --list\
+      -r --remove\
+      -u --update\
+      -c --clear-all'
+
+    SPECIFICATION_OPTIONS='\
+      -v --version\
+      --platform\
+      --all\
+      -l --local\
+      -r --remote\
+      -b --both\
+      -B --bulk-threshold\
+      --source\
+      -p --http-proxy --no-http-proxy\
+      -u --update-sources --no-update-sources'
+
+    UNINSTALL_OPTIONS='\
+      -a --all --no-all\
+      -i --ignore-dependencies --no-ignore-dependencies\
+      -x --executables --no-executables\
+      -v --version\
+      --platform'
+
+    UNPACK_OPTIONS='\
+      --target\
+      -v --version'
+
+    UPDATE_OPTIONS='\
+      --system\
+      --platform\
+      -i --install-dir\
+      -d --rdoc --no-rdoc\
+      --ri --no-ri\
+      -E --env-shebang\
+      -f --force --no-force\
+      -t --test --no-test\
+      -w --wrappers --no-wrappers\
+      -P --trust-policy\
+      --ignore-dependencies\
+      -y --include-dependencies\
+      --format-executable --no-format-executable\
+      -l --local\
+      -r --remote\
+      -b --both\
+      -B --bulk-threshold\
+      --source\
+      -p --http-proxy --no-http-proxy\
+      -u --update-sources --no-update-sources'
+
+    WHICH_OPTIONS='\
+      -a --all --no-all\
+      -g --gems-first --no-gems-first'
+
+    case "${prev}" in
+      build)
+        completions="$COMMON_OPTIONS $BUILD_OPTIONS"
+        ;;
+      cert)
+        completions="$COMMON_OPTIONS $CERT_OPTIONS"
+        ;;
+      check)
+        completions="$COMMON_OPTIONS $CHECK_OPTIONS"
+        ;;
+      cleanup)
+        completions="$COMMON_OPTIONS $CLEANUP_OPTIONS"
+        ;;
+      contents)
+        completions="$COMMON_OPTIONS $CONTENTS_OPTIONS"
+        ;;
+      dependency)
+        completions="$COMMON_OPTIONS $DEPENDENCY_OPTIONS"
+        ;;
+      environment)
+        completions="$COMMON_OPTIONS $ENVIRONMENT_OPTIONS"
+        ;;
+      fetch)
+        completions="$COMMON_OPTIONS $FETCH_OPTIONS"
+        ;;
+      generate_index)
+        completions="$COMMON_OPTIONS $GENERATE_INDEX_OPTIONS"
+        ;;
+      help)
+        completions="$COMMON_OPTIONS $HELP_OPTIONS"
+        ;;
+      install)
+        completions="$COMMON_OPTIONS $INSTALL_OPTIONS"
+        ;;
+      list)
+        completions="$COMMON_OPTIONS $LIST_OPTIONS"
+        ;;
+      lock)
+        completions="$COMMON_OPTIONS $LOCK_OPTIONS"
+        ;;
+      mirror)
+        completions="$COMMON_OPTIONS $MIRROR_OPTIONS"
+        ;;
+      outdated)
+        completions="$COMMON_OPTIONS $OUTDATED_OPTIONS"
+        ;;
+      pristine)
+        completions="$COMMON_OPTIONS $PRISTINE_OPTIONS"
+        ;;
+      query)
+        completions="$COMMON_OPTIONS $QUERY_OPTIONS"
+        ;;
+      rdoc)
+        completions="$COMMON_OPTIONS $RDOC_OPTIONS"
+        ;;
+      search)
+        completions="$COMMON_OPTIONS $SEARCH_OPTIONS"
+        ;;
+      server)
+        completions="$COMMON_OPTIONS $SERVER_OPTIONS"
+        ;;
+      sources)
+        completions="$COMMON_OPTIONS $SOURCES_OPTIONS"
+        ;;
+      specification)
+        completions="$COMMON_OPTIONS $SPECIFICATION_OPTIONS"
+        ;;
+      uninstall)
+        completions="$COMMON_OPTIONS $UNINSTALL_OPTIONS"
+        ;;
+      unpack)
+        completions="$COMMON_OPTIONS $UNPACK_OPTIONS"
+        ;;
+      update)
+        completions="$COMMON_OPTIONS $UPDATE_OPTIONS"
+        ;;
+      which)
+        completions="$COMMON_OPTIONS $WHICH_OPTIONS"
+        ;;
+      *)
+        completions="$COMMANDS $GEM_OPTIONS"
+        ;;
+    esac
+
+    COMPREPLY=( $( compgen -W "$completions" -- $cur ))
+    return 0
+}
+
+[ -n "${have:-}" ] && complete -F _gem $filenames gem

Deleted: packages/libgems-ruby/trunk/debian/gem.1
===================================================================
--- packages/libgems-ruby/trunk/debian/gem.1	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/gem.1	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,41 +0,0 @@
-.TH GEM "1" "July 2006" "gem 0.9.0" "User Commands"
-.SH NAME
-gem \- the front end to RubyGems
-.SH SYNOPSIS
-.IP
-gem command [arguments...] [options...]
-.IP
-gem \fB\-h\fR | \-\-help
-.IP
-gem \fB\-v\fR | \-\-version
-.fi
-.SH DESCRIPTION
-.B gem
-is the front end to RubyGems, a sophisticated package manager for Ruby. This is a
-basic help message containing pointers to more information.
-.PP
-Further help:
-.TP
-gem help commands
-list all 'gem' commands
-.TP
-gem help examples
-show some examples of usage
-.TP
-gem help <COMMAND>
-show help on COMMAND
-.IP
-(e.g. 'gem help install')
-.IP
-.PP
-Further information:
-.IP
-http://rubygems.org/
-.SH EXAMPLES
-.IP
-.nf
-gem install rake
-gem list \fB\-\-local\fR
-gem build package.gemspec
-gem help install
-.fi

Copied: packages/libgems-ruby/trunk/debian/gem1.8.1 (from rev 2338, packages/libgems-ruby/trunk/debian/gem.1)
===================================================================
--- packages/libgems-ruby/trunk/debian/gem1.8.1	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/gem1.8.1	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1,41 @@
+.TH GEM1.8 "1" "Dec 2007" "gem1.8 1.0.0" "User Commands"
+.SH NAME
+gem1.8 \- the front end to RubyGems
+.SH SYNOPSIS
+.IP
+gem1.8 command [arguments...] [options...]
+.IP
+gem1.8 \fB\-h\fR | \-\-help
+.IP
+gem1.8 \fB\-v\fR | \-\-version
+.fi
+.SH DESCRIPTION
+.B gem1.8
+is the front end to RubyGems, a sophisticated package manager for Ruby. This is a
+basic help message containing pointers to more information.
+.PP
+Further help:
+.TP
+gem1.8 help commands
+list all 'gem1.8' commands
+.TP
+gem1.8 help examples
+show some examples of usage
+.TP
+gem1.8 help <COMMAND>
+show help on COMMAND
+.IP
+(e.g. 'gem1.8 help install')
+.IP
+.PP
+Further information:
+.IP
+http://rubygems.org/
+.SH EXAMPLES
+.IP
+.nf
+gem1.8 install rake
+gem1.8 list \fB\-\-local\fR
+gem1.8 build package.gemspec
+gem1.8 help install
+.fi

Deleted: packages/libgems-ruby/trunk/debian/gem_mirror.1
===================================================================
--- packages/libgems-ruby/trunk/debian/gem_mirror.1	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/gem_mirror.1	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,16 +0,0 @@
-.TH GEM_MIRROR "1" "July 2006" "gem_mirror (0.9.0)" "User Commands"
-.SH NAME
-gem_mirror \- Make a mirror of a Gems provider
-.SH SYNOPSIS
-.B gem_mirror
-.SH DESCRIPTION
-.B gem_mirror
-makes a mirror of a Gems provider. The configuration file (~/.gemmirrorc) is
-required to set `from' and `to'.  
-.TP
-sample:
-.nf
--
-  from: http://gems.rubyforge.org/
-  to: /Users/glasser/MyGEMS/gems.rubyforge.org
-.fi

Deleted: packages/libgems-ruby/trunk/debian/gem_server.sgml
===================================================================
--- packages/libgems-ruby/trunk/debian/gem_server.sgml	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/gem_server.sgml	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  Smaples:
-  http://svn.annodex.net/liboggz/trunk/doc/oggzinfo.1.sgml
-  http://mama.sourceforge.net/doc/html/node7.html
-  
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Daigo</firstname>">
-  <!ENTITY dhsurname   "<surname>Moriwaki</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>April 29, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>beatles at sgtpepper.net</email>">
-  <!ENTITY dhusername  "Daigo Moriwaki">
-  <!ENTITY dhucpackage "<refentrytitle>GEM_SERVER</refentrytitle>">
-  <!ENTITY dhpackage   "gem_server">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry id="gem_server">
-  
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Start up web server to see docs of the installed gems.</refpurpose>
-  </refnamediv>
-  
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      
-      <group><arg choice="opt">-p</arg><arg choice="opt">--port=<arg choice="req">PORT</arg></arg></group>
-      <group><arg choice="opt">-d</arg><arg choice="opt">--dir=<arg choice="req">GEMDIR</arg></arg></group>
-    </cmdsynopsis>
-    
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      
-      <group><arg choice="opt">-h</arg><arg choice="opt">--help</arg></group>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para><command>&dhpackage;</command> starts up web server to see docs of the installed gems.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-  </refsect1>
-  
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      <command>&dhpackage;</command> accepts the following options:
-    </para>
-
-    <variablelist>
-      
-      <varlistentry>
-        <term>-h, --help</term>
-        <listitem><para>Show summary of options.</para></listitem>
-      </varlistentry>
-      
-      <varlistentry>
-        <term>-p=<emphasis>PORT</emphasis>, --port=<emphasis>PORT</emphasis></term>
-        <listitem><para>Specify the port to listen on.</para></listitem>
-      </varlistentry>
-      
-      <varlistentry>
-        <term>-d=<emphasis>GEMDIR</emphasis>, --dir=<emphasis>GEMDIR</emphasis></term>
-        <listitem><para>Specify the directory from which to serve Gems.</para></listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>gem (1)</para>
-  </refsect1>
-  
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in /usr/share/common-licenses/GPL.
-    </para>
-  </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-

Deleted: packages/libgems-ruby/trunk/debian/gemlock.1
===================================================================
--- packages/libgems-ruby/trunk/debian/gemlock.1	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/gemlock.1	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,47 +0,0 @@
-.TH GEMLOCK "1" "July 2006" "gemlock (0.9.0)" "User Commands"
-.SH NAME
-gemlock \- Generate a lockdown list of a set of gems
-.SH SYNOPSIS
-.B gemlock
-[\fIoptions\fR] \fIGEM_NAME-VERSION\fR...
-.SH DESCRIPTION
-.B gemlock
-will generate a list of require_gem statements that will
-lock down the versions for the gem given in the command line.  It
-will specify exact versions in the requirements list to ensure that
-the gems loaded will always be consistent. A full recursive search
-of all effected gems will be generated.
-.SH OPTIONS
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Verbose output
-.TP
-\fB\-s\fR, \fB\-\-[no\-]strict\fR
-Fail if unable to satisfy a dependency
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this message
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-Show version
-.SH EXAMPLES
-.IP
-gemlock rails-1.0.0 > lockdown.rb
-.PP
-will produce in lockdown.rb:
-.IP
-.nf
-require "rubygems"
-gem 'rails', '= 1.0.0'
-gem 'rake', '= 0.7.0.1'
-gem 'activesupport', '= 1.2.5'
-gem 'activerecord', '= 1.13.2'
-gem 'actionpack', '= 1.11.2'
-gem 'actionmailer', '= 1.1.5'
-gem 'actionwebservice', '= 1.0.0'
-.fi
-.PP
-Just load lockdown.rb from your application to ensure that the
-current versions are loaded. Make sure that lockdown.rb is loaded
-before any other require statements.
-

Deleted: packages/libgems-ruby/trunk/debian/gemri.1
===================================================================
--- packages/libgems-ruby/trunk/debian/gemri.1	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/gemri.1	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,18 +0,0 @@
-.TH GEMRI "1" "July 2006" "gemri (0.9.0)" "User Commands"
-.SH NAME
-gemri \- the ri command that includes gems documents
-.SH SYNOPSIS
-.B gemri
-[\fIoptions\fR] [\fInames\fR...]
-.SH DESCRIPTION
-.B gemri
-is a gem version of the 
-.B ri
-command, which adds the gem-generated ri documents to the search path of 
-.B ri.
-.SH OPTIONS
-Options are same as 
-.B ri
-\'s.
-.SH "SEE ALSO"
-ri(1)

Deleted: packages/libgems-ruby/trunk/debian/gemwhich.sgml
===================================================================
--- packages/libgems-ruby/trunk/debian/gemwhich.sgml	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/gemwhich.sgml	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,160 +0,0 @@
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-<!-- Process this file with docbook-to-man to generate an nroff manual
-     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
-     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
-     less'.  A typical entry in a Makefile or Makefile.am is:
-
-manpage.1: manpage.sgml
-	docbook-to-man $< > $@
-
-    
-	The docbook-to-man binary is found in the docbook-to-man package.
-	Please remember that if you create the nroff version in one of the
-	debian/rules file targets (such as build), you will need to include
-	docbook-to-man in your Build-Depends control field.
-
-  Smaples:
-  http://svn.annodex.net/liboggz/trunk/doc/oggzinfo.1.sgml
-  http://mama.sourceforge.net/doc/html/node7.html
-  
-  -->
-
-  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
-  <!ENTITY dhfirstname "<firstname>Daigo</firstname>">
-  <!ENTITY dhsurname   "<surname>Moriwaki</surname>">
-  <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>April 28, 2005</date>">
-  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
-       allowed: see man(7), man(1). -->
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>beatles at sgtpepper.net</email>">
-  <!ENTITY dhusername  "Daigo Moriwaki">
-  <!ENTITY dhucpackage "<refentrytitle>GEMWHICH</refentrytitle>">
-  <!ENTITY dhpackage   "gemwhich">
-
-  <!ENTITY debian      "<productname>Debian GNU/Linux</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry id="gemwhich">
-  
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>Find the location of a library module</refpurpose>
-  </refnamediv>
-  
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      
-      <group><arg choice="opt">-v</arg><arg choice="opt">--verbose</arg></group>
-      <arg choice="plain" rep="repeat">libname</arg>
-    </cmdsynopsis>
-    
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-      
-      <group><arg choice="opt">-h</arg><arg choice="opt">--help</arg></group>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para><command>&dhpackage;</command> finds the location of a library module.</para>
-
-    <para>This manual page was written for the &debian; distribution
-      because the original program does not have a manual page.
-      Instead, it has documentation in the &gnu;
-      <application>Info</application> format; see below.</para>
-  </refsect1>
-  
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      <command>&dhpackage;</command> accepts the following options:
-    </para>
-
-    <variablelist>
-      
-      <varlistentry>
-        <term>-h, --help</term>
-        <listitem><para>Show summary of options.</para></listitem>
-      </varlistentry>
-      
-      <varlistentry>
-        <term>-v, --verbose</term>
-        <listitem><para>Enable verbose output</para></listitem>
-      </varlistentry>
-      
-      <varlistentry>
-        <term>libname</term>
-        <listitem><para>library names</para></listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  
-  <refsect1>
-    <title>SEE ALSO</title>
-
-    <para>gem (1), gem_server (1).</para>
-  </refsect1>
-  
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &dhemail; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in /usr/share/common-licenses/GPL.
-    </para>
-  </refsect1>
-
-</refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-default-dtd-file:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
--->
-
-

Deleted: packages/libgems-ruby/trunk/debian/index_gem_repository.1
===================================================================
--- packages/libgems-ruby/trunk/debian/index_gem_repository.1	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/index_gem_repository.1	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,22 +0,0 @@
-.TH INDEX_GEM_REPOSITORY "1" "July 2006" "index_gem_repository 0.9.0" "User Commands"
-.SH NAME
-index_gem_repository \- generate the yaml/yaml.Z index files for a gem server directory
-.SH SYNOPSIS
-.B index_gem_repository
-[\fIoptions\fR]
-.SH DESCRIPTION
-.TP
-\fB\-d\fR, \fB\-\-dir\fR, \fB\-\-directory\fR=\fIDIRNAME\fR
-repository base dir containing gems subdir
-.TP
-\fB\-\-[no\-]quick\fR
-include quick index
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-show verbose output
-.TP
-\fB\-V\fR, \fB\-\-version\fR
-show version
-.TP
-\fB\-\-help\fR
-show this message

Added: packages/libgems-ruby/trunk/debian/libgems-ruby1.8.dirs
===================================================================
--- packages/libgems-ruby/trunk/debian/libgems-ruby1.8.dirs	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/libgems-ruby1.8.dirs	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1,2 @@
+usr/bin/
+var/lib/gems/1.8/

Modified: packages/libgems-ruby/trunk/debian/libgems-ruby1.8.docs
===================================================================
--- packages/libgems-ruby/trunk/debian/libgems-ruby1.8.docs	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/libgems-ruby1.8.docs	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,4 +1,3 @@
 README
-Releases
-doc
 test
+html

Modified: packages/libgems-ruby/trunk/debian/libgems-ruby1.8.install
===================================================================
--- packages/libgems-ruby/trunk/debian/libgems-ruby1.8.install	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/libgems-ruby1.8.install	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,2 +1,3 @@
-usr/lib/
-var/
+usr/bin/gem1.8
+usr/lib/ruby/1.8/
+var/lib/gems/1.8/

Modified: packages/libgems-ruby/trunk/debian/patches/00list
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/00list	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/00list	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,17 +1,6 @@
-01_rubygems.dpatch
-02_post-install.dpatch
-03_config_file.dpatch
-04_gem_runner.dpatch
-05_gem_commands.dpatch
-06_dependency_list.dpatch
-07_security.dpatch
+01_default_gem_path.dpatch
+03_disable_update_system.dpatch
 08_tighter_search_regex.dpatch
-09_installer.dpatch 
-10_datadir.dpatch
-21_avoid_ioseek.dpatch 
-22_add_bash_completion.dpatch
-#90_opensuse_gem_commands.dpatch
-#91_opensuse_installer.dpatch
-#92_opensuse_gem_commands.dpatch
-#93_opensuse_installer.dpatch
-
+21_avoid_ioseek.dpatch
+#05_gem_commands.dpatch
+#09_installer.dpatch 

Added: packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_default_gem_path.dpatch by James Healy <jimmy at deefa.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Changes the default gem dir from inside the ruby lib to /var/lib/gems/{ruby version}
+
+ at DPATCH@
+diff -urNad trunk~/lib/rubygems/defaults.rb trunk/lib/rubygems/defaults.rb
+--- trunk~/lib/rubygems/defaults.rb	2007-12-18 07:09:42.000000000 +1100
++++ trunk/lib/rubygems/defaults.rb	2007-12-21 19:29:22.000000000 +1100
+@@ -7,13 +7,14 @@
+ 
+   # Default home directory path to be used if an alternate value is not
+   # specified in the environment.
++	# 
++	# Debian patch: search order of this directory.
++	#   1. GEM_HOME enviroment variable
++	#      (Using this, Gems are to be installed in any path as you like)
++	#   2. /var/lib/gems/{ruby version} (This is the default path in Debian system)
++	#
+   def self.default_dir
+-    if defined? RUBY_FRAMEWORK_VERSION then
+-      File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
+-                ConfigMap[:ruby_version]
+-    else
+-      File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
+-    end
++    '/' + File.join('var', 'lib', 'gems', ConfigMap[:ruby_version])
+   end
+ 
+   # Default gem path.


Property changes on: packages/libgems-ruby/trunk/debian/patches/01_default_gem_path.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/libgems-ruby/trunk/debian/patches/01_rubygems.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/01_rubygems.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/01_rubygems.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_rubygems.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems.rb
-+++ libgems-ruby-0.9.0/lib/rubygems.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- # -*- ruby -*-
- 
- #--
-@@ -114,11 +113,20 @@
-     
-     # The directory path where Gems are to be installed.
-     #
-+    # Debian patch: search order of this directory.
-+    #   1. GEM_HOME enviroment variable
-+    #      (Using this, Gems are to be installed in any path as you like)
-+    #   2. /var/lib/gems (This is the default path in Debian system)
-+    #
-     # return:: [String] The directory path
-     #
-     def dir
--      @gem_home ||= nil
--      set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
-+		  ### Debian ###
-+		  #@gem_home ||= nil
-+      set_home(ENV['GEM_HOME']) if ENV['GEM_HOME']
-+      @gem_home ||= File.join("/var/lib/gems", Config::CONFIG['ruby_version'])
-+      #set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
-+		  ##############
-       @gem_home
-     end
-     

Deleted: packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/02_post-install.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_post-install.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-diff -urNad trunk~/post-install.rb trunk/post-install.rb
---- trunk~/post-install.rb	2007-05-11 04:01:45.000000000 +0900
-+++ trunk/post-install.rb	2007-05-27 08:17:36.000000000 +0900
-@@ -85,8 +85,15 @@
-     load "sources.gemspec"
-     spec = Gem.sources_spec
-     gem_file = Gem::Builder.new(spec).build
--    Gem::Installer.new(gem_file).install(true, Gem.dir, false)
--  end
-+	 ##### DEBIAN #####
-+	 p Dir.pwd
-+	 deb_dir = File.expand_path("../../debian/tmp")
-+	 bindir_orig = Config::CONFIG["bindir"]
-+	 Config::CONFIG["bindir"] = File.join(deb_dir, Config::CONFIG["bindir"])
-+	 Gem::Installer.new(gem_file).install(true, File.join("../../debian/tmp",Gem.dir), false)
-+	 Config::CONFIG["bindir"] = bindir_orig
-+	 ##################
-+ end
- end
- 
- def remove_old_rdoc
-@@ -105,7 +112,7 @@
- 
-   rubygems_name = "rubygems-#{Gem::RubyGemsVersion}"
- 
--  doc_dir = File.join Gem.dir, 'doc', rubygems_name
-+  doc_dir = File.join "debian/tmp", Gem.dir, 'doc', rubygems_name
- 
-   puts "Installing #{rubygems_name} ri..."
-   run_rdoc '--ri', '--op', File.join(doc_dir, 'ri')

Deleted: packages/libgems-ruby/trunk/debian/patches/03_config_file.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/03_config_file.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/03_config_file.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_cofig_file.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/config_file.rb
-+++ libgems-ruby-0.9.0/lib/rubygems/config_file.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
- # All rights reserved.

Added: packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_disable_update_system.dpatch by James Healy <jimmy at deefa.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disable gem update --system functionality, as it can break things. Users should use apt instead
+
+ at DPATCH@
+diff -urNad trunk~/lib/rubygems/commands/update_command.rb trunk/lib/rubygems/commands/update_command.rb
+--- trunk~/lib/rubygems/commands/update_command.rb	2007-12-16 13:42:30.000000000 +1100
++++ trunk/lib/rubygems/commands/update_command.rb	2007-12-21 19:59:11.000000000 +1100
+@@ -45,13 +45,7 @@
+ 
+   def execute
+     if options[:system] then
+-      say "Updating RubyGems..."
+-
+-      unless options[:args].empty? then
+-        fail "No gem names are allowed with the --system option"
+-      end
+-
+-      options[:args] = ["rubygems-update"]
++      fail "gem update --system is disabled on Debian. RubyGems can be updated using the official Debian repositories by aptitude or apt-get."
+     else
+       say "Updating installed gems..."
+     end


Property changes on: packages/libgems-ruby/trunk/debian/patches/03_disable_update_system.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Deleted: packages/libgems-ruby/trunk/debian/patches/04_gem_runner.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/04_gem_runner.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/04_gem_runner.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_gem_runner.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/gem_runner.rb
-+++ libgems-ruby-0.9.0/lib/rubygems/gem_runner.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
- # All rights reserved.

Deleted: packages/libgems-ruby/trunk/debian/patches/06_dependency_list.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/06_dependency_list.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/06_dependency_list.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_dependency_list.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/dependency_list.rb
-+++ libgems-ruby-0.9.0/lib/rubygems/dependency_list.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
- # All rights reserved.

Deleted: packages/libgems-ruby/trunk/debian/patches/07_security.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/07_security.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/07_security.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 07_security.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/security.rb.orig
-+++ libgems-ruby-0.9.0/lib/rubygems/security.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
- # All rights reserved.

Modified: packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/08_tighter_search_regex.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -2,18 +2,18 @@
 ## 08_tighter_search_regex.dpatch by Daigo Moriwaki <daigo at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Included at 0.8.11-2
 
 @DPATCH@
 diff -urNad trunk~/lib/rubygems/source_index.rb trunk/lib/rubygems/source_index.rb
---- trunk~/lib/rubygems/source_index.rb	2007-05-11 04:01:45.000000000 +0900
-+++ trunk/lib/rubygems/source_index.rb	2007-05-27 08:33:28.000000000 +0900
-@@ -202,7 +202,7 @@
-     #   order.  Empty if not found.
-     #
-     def search(gem_pattern, version_requirement=Version::Requirement.new(">= 0"))
--      gem_pattern = /#{ gem_pattern }/i if String === gem_pattern
-+      gem_pattern = /^#{ gem_pattern }/i if String === gem_pattern
-       version_requirement = Gem::Version::Requirement.create(version_requirement)
-       result = []
-       @gems.each do |full_spec_name, spec|
+--- trunk~/lib/rubygems/source_index.rb	2007-12-18 12:36:44.000000000 +0900
++++ trunk/lib/rubygems/source_index.rb	2007-12-23 23:54:59.000000000 +0900
+@@ -217,7 +217,7 @@
+                       end
+       else
+         version_requirement = platform_only || Gem::Requirement.default
+-        gem_pattern = /#{gem_pattern}/i
++        gem_pattern = /^#{gem_pattern}/i
+       end
+ 
+       unless Gem::Requirement === version_requirement then

Deleted: packages/libgems-ruby/trunk/debian/patches/10_datadir.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/10_datadir.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/10_datadir.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,15 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_datadir.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rbconfig/datadir.rb
-+++ libgems-ruby-0.9.0/lib/rbconfig/datadir.rb
-@@ -1,4 +1,3 @@
--#!/usr/bin/env ruby
- #--
- # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
- # All rights reserved.

Modified: packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/21_avoid_ioseek.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -2,7 +2,7 @@
 ## 21_avoid_ioseek.dpatch by Daigo Moriwaki <daigo at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: A work around for Bug#406388.
 
 @DPATCH@
 diff -urNad trunk~/lib/rubygems/package.rb trunk/lib/rubygems/package.rb

Deleted: packages/libgems-ruby/trunk/debian/patches/22_add_bash_completion.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/22_add_bash_completion.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/22_add_bash_completion.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,197 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 22_add_bash_completion.dpatch by Neil Wilson <aldursys at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad libgems-ruby-0.9.4~/conf/bash_completion.d/gem libgems-ruby-0.9.4/conf/bash_completion.d/gem
---- libgems-ruby-0.9.4~/conf/bash_completion.d/gem     1970-01-01 01:00:00.000000000 +0100
-+++ libgems-ruby-0.9.4/conf/bash_completion.d/gem      2007-08-07 21:48:16.000000000 +0100
-@@ -0,0 +1,186 @@
-+# Michael Schuerig, michael at schuerig.de, 2007-02-24
-+# Free for all uses.
-+
-+_gem()
-+{
-+    local cur prev completions
-+
-+    COMPREPLY=()
-+    cur=${COMP_WORDS[COMP_CWORD]}
-+    prev=${COMP_WORDS[COMP_CWORD-1]}
-+
-+    COMMANDS='build cert check cleanup contents dependency\
-+      environment help install list query rdoc search specification\
-+      uninstall unpack update'
-+
-+    COMMON_OPTIONS='\
-+      --source
-+      -p --http-proxy --no-http-proxy\
-+      -h --help\
-+      --config-file\
-+      --backtrace\
-+      --debug'
-+
-+    CERT_OPTIONS='\
-+      -a -add\
-+      -l --list\
-+      -r --remove\
-+      -b --build\
-+      -C --certificate\
-+      -K --private-key\
-+      -s --sign'
-+
-+    CHECK_OPTIONS='\
-+      -v --verify\
-+      -a --alien\
-+      -t --test\
-+      -V --version'
-+
-+    CLEANUP_OPTIONS='\
-+      -d --dry-run'
-+
-+    CONTENTS_OPTIONS='\
-+      -l --list\
-+      -V --version\
-+      -s --spec-dir\
-+      -v --verbose'
-+
-+    DEPENDENCY_OPTIONS='\
-+      -v --version\
-+      -r --reverse-dependencies --no-reverse-dependencies\
-+      -p --pipe'
-+
-+    HELP_OPTIONS=$COMMANDS
-+
-+    INSTALL_OPTIONS='\
-+      -v --version\
-+      -l --local\
-+      -r --remote\
-+      -b --both\
-+      -i --install-dir\
-+      -B --build-root\
-+      -d --rdoc --no-rdoc\
-+      --ri --no-ri\
-+      -f --force --no-force\
-+      -t --test --no-test\
-+      -w --wrappers --no-wrappers\
-+      -P --trust-policy\
-+      --ignore-dependencies\
-+      -y --include-dependencies'
-+
-+    LIST_OPTIONS='\
-+      -d --details --no-details\
-+      -l --local\
-+      -r --remote\
-+      -b --both'
-+
-+    QUERY_OPTIONS='\
-+      -n --name-matches\
-+      -d --details --no-details\
-+      -l --local\
-+      -r --remote\
-+      -b --both'
-+
-+    RDOC_OPTIONS='\
-+      --all\
-+      --rdoc --no-rdoc\
-+      --ri --no-ri\
-+      -v --version'
-+
-+    SEARCH_OPTIONS='\
-+      -d --details --no-details\
-+      -l --local\
-+      -r --remote\
-+      -b --both'
-+
-+    SPECIFICATION_OPTIONS='\
-+      -v --version\
-+      -l --local\
-+      -r --remote\
-+      -b --both\
-+      -all'
-+
-+    UNINSTALL_OPTIONS='\
-+      -a --all --no-all\
-+      -i --ignore-dependencies --no-ignore-dependencies\
-+      -x --executables --no-executables\
-+      -v --version'
-+
-+    UNPACK_OPTIONS='\
-+      -v --version'
-+
-+    UPDATE_OPTIONS='\
-+      -i --install-dir\
-+      -B --build-root\
-+      -d --rdoc --no-rdoc\
-+      -ri --no-ri\
-+      -f --force --no-force\
-+      -t --test --no-test\
-+      -w --wrappers --no-wrappers\
-+      -P --trust-policy\
-+      --ignore-dependencies\
-+      -y --include-dependencies\
-+      --system'
-+
-+    case "${prev}" in
-+      build)
-+        completions="$COMMON_OPTIONS $BUILD_OPTIONS"
-+        ;;
-+      cert)
-+        completions="$COMMON_OPTIONS $CERT_OPTIONS"
-+        ;;
-+      check)
-+        completions="$COMMON_OPTIONS $CHECK_OPTIONS"
-+        ;;
-+      cleanup)
-+        completions="$COMMON_OPTIONS $CLEANUP_OPTIONS"
-+        ;;
-+      contents)
-+        completions="$COMMON_OPTIONS $CONTENTS_OPTIONS"
-+        ;;
-+      dependency)
-+        completions="$COMMON_OPTIONS $DEPENDENCY_OPTIONS"
-+        ;;
-+      environment)
-+        completions="$COMMON_OPTIONS $ENVIRONMENT_OPTIONS"
-+        ;;
-+      help)
-+        completions="$COMMON_OPTIONS $HELP_OPTIONS"
-+        ;;
-+      install)
-+        completions="$COMMON_OPTIONS $INSTALL_OPTIONS"
-+        ;;
-+      list)
-+        completions="$COMMON_OPTIONS $LIST_OPTIONS"
-+        ;;
-+      query)
-+        completions="$COMMON_OPTIONS $QUERY_OPTIONS"
-+        ;;
-+      rdoc)
-+        completions="$COMMON_OPTIONS $RDOC_OPTIONS"
-+        ;;
-+      search)
-+        completions="$COMMON_OPTIONS $SEARCH_OPTIONS"
-+        ;;
-+      specification)
-+        completions="$COMMON_OPTIONS $SPECIFICATION_OPTIONS"
-+        ;;
-+      uninstall)
-+        completions="$COMMON_OPTIONS $UNINSTALL_OPTIONS"
-+        ;;
-+      unpack)
-+        completions="$COMMON_OPTIONS $UNPACK_OPTIONS"
-+        ;;
-+      update)
-+        completions="$COMMON_OPTIONS $UPDATE_OPTIONS"
-+        ;;
-+      *)
-+        completions="$COMMANDS $COMMON_OPTIONS"
-+        ;;
-+    esac
-+
-+    COMPREPLY=( $( compgen -W "$completions" -- $cur ))
-+    return 0
-+}
-+
-+[ -n "${have:-}" ] && complete -F _gem $filenames gem

Deleted: packages/libgems-ruby/trunk/debian/patches/90_opensuse_gem_commands.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/90_opensuse_gem_commands.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/90_opensuse_gem_commands.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_datadir.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/gem_commands.rb.orig
-+++ libgems-ruby-0.9.0/lib/rubygems/gem_commands.rb
-@@ -59,6 +59,10 @@
-       add_option('-i', '--install-dir DIR', '') do |value, options|
-         options[:install_dir] = value
-       end
-+      add_option('-B', '--build-root DIR', 'Temporary installation root. Useful for building packages.') do |value, options|
-+        options[:build_root] = File.expand_path(value)
-+      end
-+
-       add_option('-d', '--[no-]rdoc', 'Generate RDoc documentation for the gem on install') do |value, options|
-         options[:generate_rdoc] = value
-       end
-

Deleted: packages/libgems-ruby/trunk/debian/patches/91_opensuse_installer.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/91_opensuse_installer.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/91_opensuse_installer.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_datadir.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/installer.rb.orig
-+++ libgems-ruby-0.9.0/lib/rubygems/installer.rb
-@@ -69,7 +69,15 @@
-  	  end
-  	end
-       end
--      
-+
-+      if @options[:build_root]
-+          build_root = @options[:build_root]
-+          FileUtils.mkdir_p build_root
-+          raise Gem::FilePermissionError.new(build_root) unless File.writable?(build_root)
-+          install_dir = build_root + install_dir
-+          FileUtils.mkdir_p install_dir
-+      end
-+
-       raise Gem::FilePermissionError.new(install_dir) unless File.writable?(install_dir)
- 
-       # Build spec dir.
-@@ -167,16 +175,25 @@
-     # Determines the directory for binaries
-     #
-     def bindir(install_dir=Gem.dir)
--      if(install_dir == Gem.default_dir)
-+      if @options[:build_root]
-+          build_root = @options[:build_root]
-+          gem_default_dir = File.join(build_root, Gem.default_dir)
-+      else
-+          gem_default_dir = Gem.default_dir
-+          build_root = ""
-+      end
-+
-+      if(install_dir == gem_default_dir)
-         # mac framework support
-         if defined? RUBY_FRAMEWORK_VERSION
--          File.join(File.dirname(Config::CONFIG["sitedir"]), File.basename(Config::CONFIG["bindir"]))
-+          bin_dir = File.join(File.dirname(Config::CONFIG["sitedir"]), File.basename(Config::CONFIG["bindir"]))
-         else # generic install
--          Config::CONFIG['bindir']
-+          bin_dir = Config::CONFIG['bindir']
-         end
-       else
--        File.join(install_dir, "bin")
-+        bin_dir = File.join(install_dir, "bin")
-       end
-+      bin_dir = File.join(build_root, bin_dir)
-     end
- 
-     def generate_bin(spec, install_dir=Gem.dir)
-

Deleted: packages/libgems-ruby/trunk/debian/patches/92_opensuse_gem_commands.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/92_opensuse_gem_commands.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/92_opensuse_gem_commands.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_datadir.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/gem_commands.rb.orig
-+++ libgems-ruby-0.9.0/lib/rubygems/gem_commands.rb
-@@ -97,6 +97,12 @@
-         options[:install_dir] = File.expand_path(value)
-       end
- 
-+      add_option('-B', '--build-root DIR',
-+	'Temporary installation root. Useful for building packages.') do 
-+	|value, options|
-+        options[:build_root] = File.expand_path(value)
-+      end
-+
-       add_option('-d', '--[no-]rdoc', 
- 	'Generate RDoc documentation for the gem on install') do
- 	|value, options|
-

Deleted: packages/libgems-ruby/trunk/debian/patches/93_opensuse_installer.dpatch
===================================================================
--- packages/libgems-ruby/trunk/debian/patches/93_opensuse_installer.dpatch	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/patches/93_opensuse_installer.dpatch	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,57 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_datadir.dpatch by  <daigo at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from libgems-ruby 0.8.10-1 diff.gz
-
- at DPATCH@
-
---- libgems-ruby-0.9.0.orig/lib/rubygems/installer.rb.orig
-+++ libgems-ruby-0.9.0/lib/rubygems/installer.rb
-@@ -74,7 +74,15 @@
-  	  end
-  	end
-       end
--      
-+
-+      if @options[:build_root]
-+          build_root = @options[:build_root]
-+          FileUtils.mkdir_p build_root
-+          raise Gem::FilePermissionError.new(build_root) unless File.writable?(build_root)
-+          install_dir = build_root + install_dir
-+          FileUtils.mkdir_p install_dir
-+      end
-+
-       raise Gem::FilePermissionError.new(install_dir) unless File.writable?(install_dir)
- 
-       # Build spec dir.
-@@ -175,16 +183,25 @@
-     # Determines the directory for binaries
-     #
-     def bindir(install_dir=Gem.dir)
--      if(install_dir == Gem.default_dir)
-+      if @options[:build_root]
-+          build_root = @options[:build_root]
-+          gem_default_dir = File.join(build_root, Gem.default_dir)
-+      else
-+          gem_default_dir = Gem.default_dir
-+          build_root = ""
-+      end
-+
-+      if(install_dir == gem_default_dir)
-         # mac framework support
-         if defined? RUBY_FRAMEWORK_VERSION
--          File.join(File.dirname(Config::CONFIG["sitedir"]), File.basename(Config::CONFIG["bindir"]))
-+          bin_dir = File.join(File.dirname(Config::CONFIG["sitedir"]), File.basename(Config::CONFIG["bindir"]))
-         else # generic install
--          Config::CONFIG['bindir']
-+          bin_dir = Config::CONFIG['bindir']
-         end
-       else
--        File.join(install_dir, "bin")
-+        bin_dir = File.join(install_dir, "bin")
-       end
-+      bin_dir = File.join(build_root, bin_dir)
-     end
- 
-     def generate_bin(spec, install_dir=Gem.dir)

Added: packages/libgems-ruby/trunk/debian/postinst
===================================================================
--- packages/libgems-ruby/trunk/debian/postinst	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/postinst	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+# 
+
+case "$1" in
+  configure)
+        rm -f /var/lib/gems/1.8/source_cache
+        update-alternatives --quiet --install /usr/bin/gem gem \
+            /usr/bin/gem1.8 180 \
+	    --slave /usr/share/man/man1/gem.1.gz gem.1.gz \
+	    /usr/share/man/man1/gem1.8.1.gz \
+            --slave /etc/bash_completion.d/gem bash_completion_gem \
+            /etc/bash_completion.d/gem1.8
+       ;;
+  *)
+esac
+
+#DEBHELPER#

Added: packages/libgems-ruby/trunk/debian/prerm
===================================================================
--- packages/libgems-ruby/trunk/debian/prerm	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/prerm	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+
+case "$1" in
+    remove|deconfigure)
+        update-alternatives --quiet --remove gem /usr/bin/gem1.8
+        ;;
+    *)
+esac
+
+#DEBHELPER#

Modified: packages/libgems-ruby/trunk/debian/rubygems.install
===================================================================
--- packages/libgems-ruby/trunk/debian/rubygems.install	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/rubygems.install	2007-12-24 05:35:44 UTC (rev 2339)
@@ -1,8 +1,2 @@
-usr/bin/gem
-usr/bin/gem_mirror
-usr/bin/gem_server
-usr/bin/gemlock
-usr/bin/gemri
-usr/bin/gemwhich
-usr/bin/index_gem_repository
-etc/bash_completion.d/gem
+usr/bin/gem1.8
+etc/bash_completion.d/gem1.8

Added: packages/libgems-ruby/trunk/debian/rubygems.manpages
===================================================================
--- packages/libgems-ruby/trunk/debian/rubygems.manpages	                        (rev 0)
+++ packages/libgems-ruby/trunk/debian/rubygems.manpages	2007-12-24 05:35:44 UTC (rev 2339)
@@ -0,0 +1 @@
+debian/gem1.8.1

Modified: packages/libgems-ruby/trunk/debian/rules
===================================================================
--- packages/libgems-ruby/trunk/debian/rules	2007-12-21 19:54:20 UTC (rev 2338)
+++ packages/libgems-ruby/trunk/debian/rules	2007-12-24 05:35:44 UTC (rev 2339)
@@ -16,32 +16,21 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-RUBY_VERSION = 1.8
-RUBY = /usr/bin/ruby$(RUBY_VERSION)
-RUBYLIBDIR = $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['rubylibdir']")
+RAKE = /usr/bin/rake
+RUBY18 = /usr/bin/ruby1.8
+RUBY18LIBDIR = $(shell $(RUBY18) -rrbconfig -e "puts Config::CONFIG['rubylibdir']")
 
-manpages = gem_server.1 gemwhich.1
-built_manpages = debian/gem.1 debian/gemlock.1 debian/gemri.1 debian/index_gem_repository.1 \
-								 debian/gem_mirror.1
-
-$(manpages): %.1: debian/%.sgml
-	docbook-to-man $< > $@
-
 config: config-stamp
 config-stamp: patch
 	dh_testdir
 
-	mkdir -p debian/tmp/var/lib/gems/$(RUBY_VERSION)
-	$(RUBY) setup.rb config --siterubyver=$(RUBYLIBDIR)
-
+	mkdir -p debian/tmp/var/lib/gems/1.8
 	touch config-stamp
 
 build: build-stamp
-build-stamp: config $(manpages) 
+build-stamp: config
 	dh_testdir
 
-	$(RUBY) setup.rb setup
-
 	touch build-stamp
  
 clean:: clean1 unpatch
@@ -52,22 +41,26 @@
 
 	# Add here commands to clean up after the build process.
 	dh_clean
+	rm -rf html
 
-	$(RUBY) setup.rb clean
-	rm -f pkgs/sources/sources-*.gem
-	rm -f $(manpages)
+	#rm -f pkgs/sources/sources-*.gem
 
 install:
-	$(RUBY) setup.rb install --prefix=debian/tmp
-	rm -f  debian/tmp/usr/bin/update_rubygems
+	$(RUBY18) setup.rb --no-rdoc --no-ri --prefix=debian/tmp
+	$(RUBY18) -rfileutils -e "FileUtils::mkdir_p 'debian/tmp$(RUBY18LIBDIR)'"
+	$(RAKE) rdoc
+	mv debian/tmp/lib/* debian/tmp$(RUBY18LIBDIR)/
+	mv debian/tmp/bin debian/tmp/usr/
+	rm -f debian/tmp/usr/bin/update_rubygems*
 	
+	cp -r debian/etc debian/tmp/
+	
 	dh_testdir
 	dh_testroot
 	# dh_clean -k
 	dh_installdirs
 	
 	# DEBUG tree debian/tmp
-	mv debian/tmp/usr/bin/index_gem_repository.rb debian/tmp/usr/bin/index_gem_repository
 	dh_install --list-missing --sourcedir=debian/tmp
 	rm -rf debian/libgems-ruby1.8/usr/bin
 	#cp -ar docs debian/libgems-ruby1.8/usr/share/doc/libgems-ruby1.8/
@@ -89,7 +82,7 @@
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman --package=rubygems $(manpages) $(built_manpages)
+	dh_installman
 	dh_link -i
 	dh_strip -i
 	dh_compress -i 




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