[DRE-commits] r1598 - in packages/libjson-ruby/trunk: . debian

[paulvt at alioth.debian.org]

Author: paulvt
Date: 2007-05-18 20:30:38 +0000 (Fri, 18 May 2007)
New Revision: 1598

Modified:
   packages/libjson-ruby/trunk/debian/changelog
   packages/libjson-ruby/trunk/setup.rb
Log:
* Updated setup.rb so that it supports the distclean target. 

Modified: packages/libjson-ruby/trunk/debian/changelog
===================================================================
--- packages/libjson-ruby/trunk/debian/changelog	2007-05-18 20:27:18 UTC (rev 1597)
+++ packages/libjson-ruby/trunk/debian/changelog	2007-05-18 20:30:38 UTC (rev 1598)
@@ -9,8 +9,9 @@
     drop the Uploaders rule.
   * Moved the build-depend-indep on ruby-pkg-tools to the build-depends
     for it is used in the clean target.
+  * Updated setup.rb so that it supports the distclean target. 
 
- -- Paul van Tilburg <paulvt at debian.org>  Fri, 18 May 2007 22:24:14 +0200
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 18 May 2007 22:30:23 +0200
 
 libjson-ruby (0.4.2-1) unstable; urgency=low
 

Modified: packages/libjson-ruby/trunk/setup.rb
===================================================================
--- packages/libjson-ruby/trunk/setup.rb	2007-05-18 20:27:18 UTC (rev 1597)
+++ packages/libjson-ruby/trunk/setup.rb	2007-05-18 20:30:38 UTC (rev 1598)
@@ -325,7 +325,9 @@
   PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
                'the directory for man pages'),
   PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
-               'the directory for man pages'),
+               'the directory for system configuration files'),
+  PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']),
+               'the directory for local state data'),
   PathItem.new('stdruby', 'path', stdruby,
                'the directory for standard ruby libraries'),
   PathItem.new('siteruby', 'path', siteruby,
@@ -602,6 +604,12 @@
     @config[key] = val
   end
 
+  def get_option(key)
+    @options[key]
+  end
+
+  alias option get_option
+
   #
   # srcdir/objdir (works only in the package directory)
   #
@@ -1034,7 +1042,7 @@
 
 class Installer
 
-  FILETYPES = %w( bin lib ext data )
+  FILETYPES = %w( bin lib ext data conf )
 
   include HookScriptAPI
   include HookUtils
@@ -1115,6 +1123,9 @@
   def config_dir_data(rel)
   end
 
+  def config_dir_conf(rel)
+  end
+
   #
   # TASK setup
   #
@@ -1159,6 +1170,9 @@
   def setup_dir_data(rel)
   end
 
+  def setup_dir_conf(rel)
+  end
+
   #
   # TASK install
   #
@@ -1180,13 +1194,19 @@
     return unless extdir?(curr_srcdir())
     install_files ruby_extentions('.'),
                   "#{config('sodir')}/#{File.dirname(rel)}",
-                  0644  # This was 0555, why?! - Paul <paulvt at debian.org>
+                  0555
   end
 
   def install_dir_data(rel)
     install_files collect_filenames_auto(), "#{config('datadir')}/#{rel}", 0644
   end
 
+  def install_dir_conf(rel)
+    install_files collect_filenames_auto(), 
+                  "#{config('sysconfdir')}/#{rel}",
+                  0644
+  end
+
   def install_files(list, dest, mode)
     mkdir_p dest, @options['install-prefix']
     list.each do |fname|
@@ -1278,6 +1298,9 @@
   def clean_dir_data(rel)
   end
 
+  def clean_dir_conf(rel)
+  end
+
   #
   # TASK distclean
   #
@@ -1299,6 +1322,12 @@
     make 'distclean' if File.file?('Makefile')
   end
 
+  def distclean_dir_data(rel)
+  end
+
+  def distclean_dir_conf(rel)
+  end
+
   #
   # lib
   #