OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 19-Apr-2009 10:14:49 Branch: HEAD Handle: 2009041909144900 Modified files: openpkg-src/drupal drupal.patch drupal.spec Log: modifying package: drupal-6.10 20090416 -> 20090419 Summary: Revision Changes Path 1.36 +1 -16 openpkg-src/drupal/drupal.patch 1.462 +4 -4 openpkg-src/drupal/drupal.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.patch ============================================================================ $ cvs diff -u -r1.35 -r1.36 drupal.patch --- openpkg-src/drupal/drupal.patch 11 Dec 2008 07:10:07 -0000 1.35 +++ openpkg-src/drupal/drupal.patch 19 Apr 2009 08:14:49 -0000 1.36 @@ -318,7 +318,7 @@ --- /dev/null 2008-05-02 21:08:21 +0200 +++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56 +0200 @@ -0,0 +1,20 @@ -+/* $Id: drupal.patch,v 1.35 2008/12/11 07:10:07 rse Exp $ */ ++/* $Id: drupal.patch,v 1.36 2009/04/19 08:14:49 rse Exp $ */ + +function launch_popup(nid, mw, mh) { + var ox = mw; @@ -608,21 +608,6 @@ return $ret; } -Index: sites/all/modules/autologout/autologout.module ---- sites/all/modules/autologout/autologout.module.orig 2008-03-14 21:05:41 +0100 -+++ sites/all/modules/autologout/autologout.module 2008-06-14 15:57:27 +0200 -@@ -257,8 +257,8 @@ - if (_autologout_user_in_by_user_role($account)) { - $account->autologout = 0; - $r = db_query("SELECT setting FROM {autologout} WHERE uid = %d", $account->uid); -- if (db_num_rows($r) > 0) { -- $row = db_fetch_object($r); -+ $row = db_fetch_object($r); -+ if ($row) { - $account->autologout = (int)$row->setting; - } - } - ----------------------------------------------------------------------------- Fix helpers module for PostgreSQL usage. @@ . patch -p0 <<'@@ .' Index: openpkg-src/drupal/drupal.spec ============================================================================ $ cvs diff -u -r1.461 -r1.462 drupal.spec --- openpkg-src/drupal/drupal.spec 18 Apr 2009 13:09:58 -0000 1.461 +++ openpkg-src/drupal/drupal.spec 19 Apr 2009 08:14:49 -0000 1.462 @@ -32,7 +32,7 @@ %define V_module_alt_login 6.x-1.0 %define V_module_archive 6.x-1.3 %define V_module_atom 6.x-1.0 -%define V_module_autologout 6.x-2.1 +%define V_module_autologout 6.x-2.2 %define V_module_avatar_selection 6.x-1.5 %define V_module_backlinks 6.x-1.x-dev %define V_module_backup_migrate 6.x-1.2 @@ -50,7 +50,7 @@ %define V_module_comment_subscribe 6.x-1.2 %define V_module_condition 6.x-2.5 %define V_module_contemplate 6.x-1.0 -%define V_module_countdowntimer 6.x-2.19 +%define V_module_countdowntimer 6.x-2.20 %define V_module_css_injector 6.x-1.3 %define V_module_custom_breadcrumbs 6.x-1.4 %define V_module_customfilter 6.x-1.x-dev @@ -190,7 +190,7 @@ %define V_module_wishlist 6.x-2.3 %define V_module_xmlcontent 6.x-1.x-dev %define V_module_xmlsitemap 6.x-0.x-dev -%define V_module_xstandard 6.x-1.0-beta2 +%define V_module_xstandard 6.x-1.0 %define V_module_yui 6.x-1.1-2 %define V_module_yui_calendar 6.x-1.1-4 %define V_module_yui_editor 6.x-2.33 @@ -231,7 +231,7 @@ Group: CMS License: GPL Version: %{V_drupal} -Release: 20090416 +Release: 20090419 # package options %option with_mysql yes @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org