[DRE-commits] r5634 - in tags/activeldap: . 1.2.1-1/debian 1.2.1-1/debian/patches
Marc Dequènes
duck at alioth.debian.org
Wed Jun 23 00:54:01 UTC 2010
Author: duck
Date: 2010-06-23 00:54:00 +0000 (Wed, 23 Jun 2010)
New Revision: 5634
Added:
tags/activeldap/1.2.1-1/
tags/activeldap/1.2.1-1/debian/README.Debian
tags/activeldap/1.2.1-1/debian/changelog
tags/activeldap/1.2.1-1/debian/control
tags/activeldap/1.2.1-1/debian/control.in
tags/activeldap/1.2.1-1/debian/patches/bad_shebang
tags/activeldap/1.2.1-1/debian/patches/gem_sux
tags/activeldap/1.2.1-1/debian/patches/series
tags/activeldap/1.2.1-1/debian/rules
tags/activeldap/1.2.1-1/debian/watch
Removed:
tags/activeldap/1.2.1-1/debian/changelog
tags/activeldap/1.2.1-1/debian/control
tags/activeldap/1.2.1-1/debian/control.in
tags/activeldap/1.2.1-1/debian/libactiveldap-ruby1.8.links
tags/activeldap/1.2.1-1/debian/patches/bad_shebang
tags/activeldap/1.2.1-1/debian/patches/rails_load_path
tags/activeldap/1.2.1-1/debian/patches/series
tags/activeldap/1.2.1-1/debian/rules
tags/activeldap/1.2.1-1/debian/watch
Log:
Tagging activeldap (1.2.1-1)
Copied: tags/activeldap/1.2.1-1/debian/README.Debian (from rev 5633, trunk/activeldap/debian/README.Debian)
===================================================================
--- tags/activeldap/1.2.1-1/debian/README.Debian (rev 0)
+++ tags/activeldap/1.2.1-1/debian/README.Debian 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,9 @@
+
+ The file '/usr/share/doc/libactiveldap-ruby-doc/examples/al-admin.tgz'
+ contains several occurences of the JS Prototype Library, which have
+ been replaced by symlinks in order to avoid shipping versions of the
+ software containing security problems. You just need to install the
+ libjs-prototype to have the example in a working condition.
+
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org> Thu, 03 Dec 2009 15:15:25 +0100
+
Deleted: tags/activeldap/1.2.1-1/debian/changelog
===================================================================
--- trunk/activeldap/debian/changelog 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/changelog 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,117 +0,0 @@
-activeldap (1.0.9-2) unstable; urgency=high
-
- * 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
-
Copied: tags/activeldap/1.2.1-1/debian/changelog (from rev 5633, trunk/activeldap/debian/changelog)
===================================================================
--- tags/activeldap/1.2.1-1/debian/changelog (rev 0)
+++ tags/activeldap/1.2.1-1/debian/changelog 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,137 @@
+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
+
Deleted: tags/activeldap/1.2.1-1/debian/control
===================================================================
--- trunk/activeldap/debian/control 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/control 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,39 +0,0 @@
-Source: activeldap
-Section: ruby
-Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
-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.1), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), ruby1.8, ruby-pkg-tools (>= 0.8)
-Build-Depends-Indep: graphviz
-Standards-Version: 3.8.4
-Homepage: http://rubyforge.org/projects/ruby-activeldap
-
-Package: libactiveldap-ruby
-Architecture: all
-Depends: ${misc:Depends}, libactiveldap-ruby1.8
-Description: an object-oriented interface to LDAP for Ruby
- This is a dependency package, which depends on an ActiveLDAP package
- built for the latest version of Ruby.
-
-Package: libactiveldap-ruby-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: doc-base
-Description: an object-oriented interface to LDAP for Ruby
- This is the Rdoc-generated documentation for ActiveLDAP API.
-
-Package: libactiveldap-ruby1.8
-Architecture: all
-Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), rails, libgettext-ruby1.8
-Suggests: liblog4r-ruby1.8 (>= 1.0.4)
-Description: an object-oriented interface to LDAP for Ruby
- ActiveLDAP is a wrapper around Ruby/LDAP with its interface inspired
- by ActiveRecord (from the Rails project).
- .
- It dynamically parses the LDAP server’s schema based on the
- objectClasses an entry has. It then exposes the LDAP attributes as
- methods on the object. This means that if you update the objectClass
- on an object, the methods/attributes available for changing are
- automatically updated.
-
Copied: tags/activeldap/1.2.1-1/debian/control (from rev 5633, trunk/activeldap/debian/control)
===================================================================
--- tags/activeldap/1.2.1-1/debian/control (rev 0)
+++ tags/activeldap/1.2.1-1/debian/control 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,40 @@
+Source: activeldap
+Section: ruby
+Priority: optional
+Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
+Build-Depends: cdbs (>= 0.4.53),
+ debhelper (>= 7.0.1), ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
+Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
+Standards-Version: 3.8.4
+Homepage: http://rubyforge.org/projects/ruby-activeldap
+
+Package: libactiveldap-ruby
+Architecture: all
+Depends: ${misc:Depends}, libactiveldap-ruby1.8
+Description: an object-oriented interface to LDAP for Ruby
+ This is a dependency package, which depends on an ActiveLDAP package
+ built for the latest version of Ruby.
+
+Package: libactiveldap-ruby-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: doc-base, libjs-prototype
+Description: an object-oriented interface to LDAP for Ruby
+ This is the Rdoc-generated documentation for ActiveLDAP API.
+
+Package: libactiveldap-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), libactivesupport-ruby1.8 (>= 2.3.5), libactiverecord-ruby1.8 (>= 2.3.5), liblocale-ruby1.8 (>= 2.0.5), libgettext-activerecord-ruby1.8 (>= 2.1.0)
+Suggests: liblog4r-ruby1.8 (>= 1.0.4)
+Description: an object-oriented interface to LDAP for Ruby
+ ActiveLDAP is a wrapper around Ruby/LDAP with its interface inspired
+ by ActiveRecord (from the Rails project).
+ .
+ It dynamically parses the LDAP server’s schema based on the
+ objectClasses an entry has. It then exposes the LDAP attributes as
+ methods on the object. This means that if you update the objectClass
+ on an object, the methods/attributes available for changing are
+ automatically updated.
+
Deleted: tags/activeldap/1.2.1-1/debian/control.in
===================================================================
--- trunk/activeldap/debian/control.in 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/control.in 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,39 +0,0 @@
-Source: activeldap
-Section: ruby
-Priority: optional
-Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: @cdbs@, ruby1.8, ruby-pkg-tools (>= 0.8)
-Build-Depends-Indep: graphviz
-Standards-Version: 3.8.4
-Homepage: http://rubyforge.org/projects/ruby-activeldap
-
-Package: libactiveldap-ruby
-Architecture: all
-Depends: ${misc:Depends}, libactiveldap-ruby1.8
-Description: an object-oriented interface to LDAP for Ruby
- This is a dependency package, which depends on an ActiveLDAP package
- built for the latest version of Ruby.
-
-Package: libactiveldap-ruby-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: doc-base
-Description: an object-oriented interface to LDAP for Ruby
- This is the Rdoc-generated documentation for ActiveLDAP API.
-
-Package: libactiveldap-ruby1.8
-Architecture: all
-Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), rails (>= 2.3.2), libgettext-ruby1.8
-Suggests: liblog4r-ruby1.8 (>= 1.0.4)
-Description: an object-oriented interface to LDAP for Ruby
- ActiveLDAP is a wrapper around Ruby/LDAP with its interface inspired
- by ActiveRecord (from the Rails project).
- .
- It dynamically parses the LDAP server’s schema based on the
- objectClasses an entry has. It then exposes the LDAP attributes as
- methods on the object. This means that if you update the objectClass
- on an object, the methods/attributes available for changing are
- automatically updated.
-
Copied: tags/activeldap/1.2.1-1/debian/control.in (from rev 5633, trunk/activeldap/debian/control.in)
===================================================================
--- tags/activeldap/1.2.1-1/debian/control.in (rev 0)
+++ tags/activeldap/1.2.1-1/debian/control.in 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,39 @@
+Source: activeldap
+Section: ruby
+Priority: optional
+Maintainer: Marc Dequènes (Duck) <Duck at DuckCorp.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>, Deepak Tripathi <apenguinlinux at gmail.com>
+Build-Depends: @cdbs@, ruby (>= 1.8.1), ruby-pkg-tools (>= 0.8)
+Build-Depends-Indep: rdoc (>= 1.8.1), graphviz
+Standards-Version: 3.8.4
+Homepage: http://rubyforge.org/projects/ruby-activeldap
+
+Package: libactiveldap-ruby
+Architecture: all
+Depends: ${misc:Depends}, libactiveldap-ruby1.8
+Description: an object-oriented interface to LDAP for Ruby
+ This is a dependency package, which depends on an ActiveLDAP package
+ built for the latest version of Ruby.
+
+Package: libactiveldap-ruby-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: doc-base, libjs-prototype
+Description: an object-oriented interface to LDAP for Ruby
+ This is the Rdoc-generated documentation for ActiveLDAP API.
+
+Package: libactiveldap-ruby1.8
+Architecture: all
+Depends: ${misc:Depends}, libruby1.8, libldap-ruby1.8 (>= 0.8.2), libactivesupport-ruby1.8 (>= 2.3.5), libactiverecord-ruby1.8 (>= 2.3.5), liblocale-ruby1.8 (>= 2.0.5), libgettext-activerecord-ruby1.8 (>= 2.1.0)
+Suggests: liblog4r-ruby1.8 (>= 1.0.4)
+Description: an object-oriented interface to LDAP for Ruby
+ ActiveLDAP is a wrapper around Ruby/LDAP with its interface inspired
+ by ActiveRecord (from the Rails project).
+ .
+ It dynamically parses the LDAP server’s schema based on the
+ objectClasses an entry has. It then exposes the LDAP attributes as
+ methods on the object. This means that if you update the objectClass
+ on an object, the methods/attributes available for changing are
+ automatically updated.
+
Deleted: tags/activeldap/1.2.1-1/debian/libactiveldap-ruby1.8.links
===================================================================
--- trunk/activeldap/debian/libactiveldap-ruby1.8.links 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/libactiveldap-ruby1.8.links 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1 +0,0 @@
-/usr/share/rails/actionmailer/README /usr/share/doc/rails/README.activeldap
Deleted: tags/activeldap/1.2.1-1/debian/patches/bad_shebang
===================================================================
--- trunk/activeldap/debian/patches/bad_shebang 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/patches/bad_shebang 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,10 +0,0 @@
-Index: activeldap-1.0.9/lib/active_ldap.rb
-===================================================================
---- activeldap-1.0.9.orig/lib/active_ldap.rb 2009-06-04 03:45:01.000000000 +0200
-+++ activeldap-1.0.9/lib/active_ldap.rb 2009-06-24 22:46:52.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/ruby
-+#
- # = ActiveLdap
- #
- # "ActiveLdap" Copyright (C) 2004,2005 Will Drewry mailto:will at alum.bu.edu
Copied: tags/activeldap/1.2.1-1/debian/patches/bad_shebang (from rev 5633, trunk/activeldap/debian/patches/bad_shebang)
===================================================================
--- tags/activeldap/1.2.1-1/debian/patches/bad_shebang (rev 0)
+++ tags/activeldap/1.2.1-1/debian/patches/bad_shebang 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,10 @@
+Index: activeldap-1.2.1/lib/active_ldap.rb
+===================================================================
+--- activeldap-1.2.1.orig/lib/active_ldap.rb 2010-06-23 00:38:15.000000000 +0200
++++ activeldap-1.2.1/lib/active_ldap.rb 2010-06-23 00:50:43.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/ruby
++#
+ # = ActiveLdap
+ #
+ # Copyright (C) 2004,2005 Will Drewry mailto:will at alum.bu.edu
Copied: tags/activeldap/1.2.1-1/debian/patches/gem_sux (from rev 5633, trunk/activeldap/debian/patches/gem_sux)
===================================================================
--- tags/activeldap/1.2.1-1/debian/patches/gem_sux (rev 0)
+++ tags/activeldap/1.2.1-1/debian/patches/gem_sux 2010-06-23 00:54:00 UTC (rev 5634)
@@ -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'
Deleted: tags/activeldap/1.2.1-1/debian/patches/rails_load_path
===================================================================
--- trunk/activeldap/debian/patches/rails_load_path 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/patches/rails_load_path 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,19 +0,0 @@
-Index: activeldap-1.0.9/lib/active_ldap.rb
-===================================================================
---- activeldap-1.0.9.orig/lib/active_ldap.rb 2009-06-24 22:46:52.000000000 +0200
-+++ activeldap-1.0.9/lib/active_ldap.rb 2009-06-24 22:47:03.000000000 +0200
-@@ -872,6 +872,14 @@
- # package, and I'd like to see it prove helpful to more people than just myself.
- #
-
-+# add Rails load path for Debian, until rails framework is split properly
-+DEB_RAILS_PATH = "/usr/share/rails"
-+Dir.new(DEB_RAILS_PATH).each do |file|
-+ next if file =~ /^\./
-+ path = File.join(DEB_RAILS_PATH, file, "lib")
-+ $: << path if File.directory?(path)
-+end
-+
- require_gem_if_need = Proc.new do |library_name, gem_name, *gem_args|
- gem_name ||= library_name
- begin
Deleted: tags/activeldap/1.2.1-1/debian/patches/series
===================================================================
--- trunk/activeldap/debian/patches/series 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/patches/series 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,2 +0,0 @@
-bad_shebang
-rails_load_path
Copied: tags/activeldap/1.2.1-1/debian/patches/series (from rev 5633, trunk/activeldap/debian/patches/series)
===================================================================
--- tags/activeldap/1.2.1-1/debian/patches/series (rev 0)
+++ tags/activeldap/1.2.1-1/debian/patches/series 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,2 @@
+bad_shebang
+gem_sux
Deleted: tags/activeldap/1.2.1-1/debian/rules
===================================================================
--- trunk/activeldap/debian/rules 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/rules 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,22 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-
-
-RUBY_ARCHALLDIR=/usr/lib/ruby/1.8
-
-install/libactiveldap-ruby1.8::
- mkdir -p debian/$(cdbs_curpkg)/$(RUBY_ARCHALLDIR)
- cp -r lib/* debian/$(cdbs_curpkg)/$(RUBY_ARCHALLDIR)/
- find debian/$(cdbs_curpkg)/$(RUBY_ARCHALLDIR)/ -type f -exec chmod a-x {} \;
-
-binary-install/libactiveldap-ruby-doc::
- tar -cz -C debian/$(cdbs_curpkg)/usr/share/doc/libactiveldap-ruby-doc/examples/ --remove-files \
- -f debian/$(cdbs_curpkg)/usr/share/doc/libactiveldap-ruby-doc/examples/al-admin.tgz al-admin
-
-$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) ::
- find debian/$(cdbs_curpkg) -depth -name ".arch-ids" -exec rm -rf {} \;
-
Copied: tags/activeldap/1.2.1-1/debian/rules (from rev 5633, trunk/activeldap/debian/rules)
===================================================================
--- tags/activeldap/1.2.1-1/debian/rules (rev 0)
+++ tags/activeldap/1.2.1-1/debian/rules 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
+
+
+install/libactiveldap-ruby1.8::
+ mkdir -p debian/$(cdbs_curpkg)/$(DEB_RUBY_LIBDIR)
+ cp -r lib/* debian/$(cdbs_curpkg)/$(DEB_RUBY_LIBDIR)/
+ find debian/$(cdbs_curpkg)/$(DEB_RUBY_LIBDIR)/ -type f -exec chmod a-x {} \;
+
+binary-install/libactiveldap-ruby-doc::
+ find debian/$(cdbs_curpkg) -name "prototype.js" -delete -exec ln -s /usr/share/javascript/prototype/prototype.js {} \;
+ tar -cz -C debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples \
+ -f debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/al-admin.tgz al-admin
+ rm -rf debian/$(cdbs_curpkg)/usr/share/doc/$(cdbs_curpkg)/examples/al-admin
+
Deleted: tags/activeldap/1.2.1-1/debian/watch
===================================================================
--- trunk/activeldap/debian/watch 2010-06-23 00:21:08 UTC (rev 5632)
+++ tags/activeldap/1.2.1-1/debian/watch 2010-06-23 00:54:00 UTC (rev 5634)
@@ -1,4 +0,0 @@
-version=3
-http://rubyforge.org/frs/?group_id=381 \
- (?:.*/)?(?:ruby-)?activeldap-([0-9.]+).(?:tar\.gz|tgz) \
- debian uupdate
Copied: tags/activeldap/1.2.1-1/debian/watch (from rev 5633, trunk/activeldap/debian/watch)
===================================================================
--- tags/activeldap/1.2.1-1/debian/watch (rev 0)
+++ tags/activeldap/1.2.1-1/debian/watch 2010-06-23 00:54:00 UTC (rev 5634)
@@ -0,0 +1,4 @@
+version=3
+http://rubyforge.org/frs/?group_id=381 \
+ (?:.*/)?activeldap-([0-9.]+).(?:tar\.gz|tgz) \
+ debian uupdate
More information about the Pkg-ruby-extras-commits
mailing list