[DRE-commits] [SCM] ruby-activeldap.git branch, master, updated. upstream/1.2.4-2-gcd2789a

=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck) Duck at DuckCorp.org
Mon Jul 18 15:46:01 UTC 2011


The following commit has been merged in the master branch:
commit cd2789a49b563bf91d3fdd6d0eb28f049e5311d5
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Mon Jul 18 17:45:55 2011 +0200

    [evol] NUR and conversion to gem2deb style (unfinished: waiting for deps)

diff --git a/debian/changelog b/debian/changelog
index 881c929..4c82538 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,170 @@
 ruby-activeldap (1.2.4-1) UNRELEASED; urgency=low
 
-  * Initial release (Closes: #nnnn)
+TODO: work or wait for gem2deb conversions:
+  - liblocale-ruby1.8
+  - libgettext-activerecord-ruby
+
+  * New upstream release.
+  * Switched to gem2deb packaging style.
+  * Switched to the new git repository.
+  * The al-admin example is no more included in this project but
+    is living its own life.
+  * Removed patch 'bad_shebang' integrated upstream.
+  * Converted copyright file to DEP5 and updated content.
 
  -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 18 Jul 2011 13:30:58 +0200
+
+activeldap (1.2.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added Vcs fields in control file.
+  * Increased Standards-Version to 3.9.0 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 19 Jul 2010 00:57:19 +0200
+
+activeldap (1.2.1-2) unstable; urgency=low
+
+  * Removing rdoc. Since its provided by 
+  ruby's virtual package now. (Closes: #587114).
+  * debian/control
+     + added DMUA field.
+
+ -- Deepak Tripathi <apenguinlinux at gmail.com>  Sat, 26 Jun 2010 00:45:36 +0530
+
+activeldap (1.2.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Adapted to the new rails packages (components are now properly
+    split, reducing dependencies).
+  * Removed 'rails_load_path' patch, now useless (rails now is in the
+    standard include path).
+  * Removed useless tla VCS files cleanup.
+  * Fixed security problem with two 'prototype.js' included in a code
+    example (CVE-2007-2383, CVE-2008-7720), by using a symlink to the
+    path in the libjs-prototype package (with a note in README.Debian)
+    (Closes: #555263).
+  * In 'debian/rules', now use CDBS DEB_RUBY_LIBDIR variable instead of
+    hardcoded RUBY_ARCHALLDIR.
+  * Removed silly symlink 'README.activeldap' (Closes: #549667).
+  * Added a new patch to deactivate silly gem calls.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 23 Jun 2010 02:20:03 +0200
+
+activeldap (1.0.9-2) unstable; urgency=high
+
+  [ Deepak Tripathi ]
+  * debian/control
+    + removed rdoc. (Closes: #581333)
+    + added myself to uploaders.
+  * debian/copyright
+    + added debian's copyright information
+
+  [ Marc Dequènes ]
+  * Switched to dpkg-source 3.0 (quilt) format.
+  * Increased Standards-Version to 3.8.4 (no changes).
+  * Fixed watch file.
+
+ -- Deepak Tripathi <apenguinlinux at gmail.com>  Wed, 19 May 2010 01:07:15 -0400
+
+activeldap (1.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refreshed patches.
+  * Rails integration has changed; do not install 'rails/plugin/*' which
+    is no more.
+  * Bumped Standards-Version to 3.8.2.0 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 24 Jun 2009 23:12:45 +0200
+
+activeldap (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switched to new 'ruby' Section.
+  * Refreshed patch 'rails_load_path'.
+  * Added missing 'misc:Depends' for all binary packages.
+  * Made compliant with policy 3.8.1 (no changes).
+  * Using debhelper V7 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Wed, 18 Mar 2009 18:26:17 +0100
+
+activeldap (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu, 19 Jun 2008 10:45:15 +0200
+
+activeldap (0.9.0-2) unstable; urgency=low
+
+  * Fixed doc-base section.
+  * Regenerated 'debian/control' properly.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Fri, 21 Mar 2008 01:44:26 +0100
+
+activeldap (0.9.0-1) unstable; urgency=low
+
+  * New upstream release:
+    + The logger mechanism can be chosen freely now, so log4r moved
+      to Suggests.
+  * Moved Homepage field to the source package (dpkg supports it now).
+  * Fixed copyright information: software is GPL v2 strict.
+  * Increased Standards-Version to 3.7.3.0 (no changes).
+  * Compressed al-admin exemple.
+  * Factorized RCS files removal rules.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sat, 08 Dec 2007 12:41:30 +0100
+
+activeldap (0.8.3.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated dependencies: rails is now a dependency, and new gettext
+    support requires libgettext-ruby1.8.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Thu, 01 Nov 2007 14:53:20 +0100
+
+activeldap (0.8.2-1) unstable; urgency=low
+
+  * New upstream release:
+    - updated bad_shebang patch.
+    - updated upstream project URL.
+  * Removed the Uploaders rule.
+  * Switched compat level to 5 (no changes).
+  * Patched to work around non-standard rails load path.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 18 Jun 2007 23:39:14 +0200
+
+activeldap (0.8.1-1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - worked around silly gemization (buildsys)
+    - now a part of Rails
+    - refreshed shebang patch.
+  * Added additionnal match for .tar.gz files in watch file.
+  * Strengthened dependency versions requirements.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sat, 24 Feb 2007 17:42:26 +0100
+
+activeldap (0.7.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sun, 11 Jun 2006 00:49:04 +0200
+
+activeldap (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fixed Build-Depends/Build-Depends-Indep to ensure having necessary
+    tools for clean rule.
+  * Switched to quilt patch management system.
+  * Refreshed shebang patch.
+  * Ensure no RCS files slip into packages.
+  * Increased Standards-Version to 3.7.2.0 (no changes).
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 16 May 2006 12:37:52 +0200
+
+activeldap (0.6.0-1) unstable; urgency=low
+
+  * Initial Release.
+  * Patched to remove bad shebang in 'activeldap.rb'.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Tue, 18 Apr 2006 18:22:25 +0200
+
diff --git a/debian/control b/debian/control
index 91727c4..713d76c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,42 @@
 Source: ruby-activeldap
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
 DM-Upload-Allowed: yes
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, 
+	   Deepak Tripathi <apenguinlinux at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.5~)
+Build-Depends-Indep: graphviz
 Standards-Version: 3.9.2
-#Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activeldap.git
-#Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activeldap.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activeldap.git
+Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activeldap.git;a=summary
 Homepage: http://rubyforge.org/projects/ruby-activeldap/
 XS-Ruby-Versions: all
 
 Package: ruby-activeldap
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 # activerecord (~> 2.3.11), locale (= 2.0.5), fast_gettext (= 0.5.8), gettext_i18n_rails (= 0.2.2), rubyforge (>= 2.0.4, development), hoe (>= 2.6.1, development)
+Depends: ${misc:Depends}, ruby | ruby-interpreter, libldap-ruby1.8 (>= 0.8.2), ruby-activesupport-2.3 (>= 2.3.5), ruby-activerecord-2.3 (>= 2.3.5), liblocale-ruby1.8 (>= 2.0.5), libgettext-activerecord-ruby (>= 2.1.0)
+Provides: libactiveldap-ruby, libactiveldap-ruby1.8
+Breaks: libactiveldap-ruby, libactiveldap-ruby1.8
+Replaces: libactiveldap-ruby, libactiveldap-ruby1.8
+Suggests: ruby-log4r (>= 1.0.4)
 Description: ActiveLdap is a object-oriented API to LDAP
  'ActiveLdap' is a ruby extension library which provides a clean
  objected oriented interface to the Ruby/LDAP library.  It was inspired
  by ActiveRecord. This is not nearly as clean or as flexible as
  ActiveRecord, but it is still trivial to define new objects and manipulate
  them with minimal difficulty.
+
+Package: ruby-activeldap-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Provides: libactiveldap-ruby-doc
+Breaks: libactiveldap-ruby-doc
+Replaces: libactiveldap-ruby-doc
+Suggests: doc-base
+Description: ActiveLdap is a object-oriented API to LDAP -- API documentation
+ This is the Rdoc-generated documentation for ActiveLdap API.
+
diff --git a/debian/copyright b/debian/copyright
index fcb27be..881e377 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,94 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=co
 Upstream-Name: activeldap
-Source: FIXME (URL where source can be downloaded)
+Source: http://rubyforge.org/frs/?group_id=381
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
+Copyright: Copyright (C) 2004-2006 Will Drewry <will at alum.bu.edu>
+ Copyright (C) 2006-2011 Kouhei Sutou <tt><kou at clear-code.com></tt>
+ Copyright (C) 2004 Dick Davies <rasputnik at hellooperator.net>
+ Copyright (C) 200? Nathan Kinder <tt><quicksilver02 AT mac.com></tt>
+ Copyright (C) 2006 Patrick Cole <tt><pac AT independent.com.au></tt>
+ Copyright (C) 2006 Google Inc.
+License: GPL-2 or Ruby
+
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: Ruby
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+ .
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+ .
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+ .
+       b) use the modified software only within your corporation or
+          organization.
+ .
+       c) rename any non-standard executables so the names do not conflict
+	  with standard executables, which must also be provided.
+ .
+       d) make other distribution arrangements with the author.
+ .
+  3. You may distribute the software in object code or executable
+     form, provided that you do at least ONE of the following:
+ .
+       a) distribute the executables and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+ .
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+ .
+       c) give non-standard executables non-standard names, with
+          instructions on where to get the original software distribution.
+ .
+       d) make other distribution arrangements with the author.
+ .
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under this terms.
+ .
+     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
+     files under the ./missing directory.  See each file for the copying
+     condition.
+ .
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+ .
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
+
+Files: debian/*
+Copyright: Copyright (C)2006-2011 Marc Dequènes <Duck at DuckCorp.org>
+ Copyright (C) 2010 Deepak Tripathi <apenguinlinux at gmail.com>
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -27,7 +111,3 @@ License: GPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
diff --git a/debian/patches/gem_sux b/debian/patches/gem_sux
new file mode 100644
index 0000000..92a92a8
--- /dev/null
+++ b/debian/patches/gem_sux
@@ -0,0 +1,17 @@
+Index: activeldap-1.2.1/lib/active_ldap.rb
+===================================================================
+--- activeldap-1.2.1.orig/lib/active_ldap.rb	2010-06-23 02:11:08.000000000 +0200
++++ activeldap-1.2.1/lib/active_ldap.rb	2010-06-23 02:11:42.000000000 +0200
+@@ -890,9 +890,9 @@
+ require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
+   gem_name ||= library_name
+   begin
+-    if !gem_args.empty? and Object.const_defined?(:Gem)
+-      gem gem_name, *gem_args
+-    end
++    #if !gem_args.empty? and Object.const_defined?(:Gem)
++    #  gem gem_name, *gem_args
++    #end
+     require library_name
+   rescue LoadError
+     require 'rubygems'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..46b9c0d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gem_sux
diff --git a/debian/ruby-activeldap-doc.doc-base b/debian/ruby-activeldap-doc.doc-base
new file mode 100644
index 0000000..5529e5e
--- /dev/null
+++ b/debian/ruby-activeldap-doc.doc-base
@@ -0,0 +1,10 @@
+Document: activeldap
+Title: ActiveLDAP API Documentation
+Author: Will Drewry <will at alum.bu.edu>
+Abstract: Rdoc-generated API documentation.
+Section: Programming/Ruby
+
+Format: HTML
+Index: /usr/share/doc/libactiveldap-ruby-doc/rdoc/index.html
+Files: /usr/share/doc/libactiveldap-ruby-doc/rdoc/*
+
diff --git a/debian/ruby-activeldap-doc.examples b/debian/ruby-activeldap-doc.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/ruby-activeldap-doc.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/ruby-activeldap.docs b/debian/ruby-activeldap.docs
index 786a9ba..e845566 100644
--- a/debian/ruby-activeldap.docs
+++ b/debian/ruby-activeldap.docs
@@ -1,2 +1 @@
-# FIXME: READMEs found
-# README
+README
diff --git a/debian/ruby-activeldap.examples b/debian/ruby-activeldap.examples
deleted file mode 100644
index d970cc8..0000000
--- a/debian/ruby-activeldap.examples
+++ /dev/null
@@ -1,3 +0,0 @@
-# FIXME: examples/ dir found in source. Consider installing the examples.
-# Examples:
-# examples/*
diff --git a/debian/rules b/debian/rules
index a5e7dc8..066609c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,9 @@
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_build:
+	dh_auto_build
+	rdoc --all --inline-source --diagram --fileboxes --line-numbers --fmt=html \
+		-o /usr/share/doc/ruby-activeldap-doc/rdoc lib
+

-- 
ruby-activeldap.git



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