OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Oct-2008 20:20:52
Branch: HEAD Handle: 2008101719205100
Modified files:
openpkg-src/drupal drupal.patch drupal.spec
Log:
modifying package: drupal-6.5 20081017 again
Summary:
Revision Changes Path
1.34 +1 -18 openpkg-src/drupal/drupal.patch
1.369 +5 -5 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.33 -r1.34 drupal.patch
--- openpkg-src/drupal/drupal.patch 15 Oct 2008 18:04:40 -0000 1.33
+++ openpkg-src/drupal/drupal.patch 17 Oct 2008 18:20:51 -0000 1.34
@@ -327,7 +327,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.33 2008/10/15 18:04:40 rse Exp $ */
++/* $Id: drupal.patch,v 1.34 2008/10/17 18:20:51 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ -596,23 +596,6 @@
Index: sites/all/modules/simplefeed/simplefeed_item.install
--- sites/all/modules/simplefeed/simplefeed_item.install.orig
2008-06-11 07:22:28 +0200
+++ sites/all/modules/simplefeed/simplefeed_item.install 2008-06-14
16:23:01 +0200
-@@ -40,13 +40,15 @@
- // Fetch up to N feed items and update their iids to new schema
- $count = $_SESSION['simplefeed_item_update_2']['count'];
- $feed_items = db_query_range('SELECT r.vid, r.title, s.url FROM
{node_revisions} r JOIN {simplefeed_feed_item} s ON r.vid = s.vid ORDER BY
r.vid ASC', $count, $limit);
-+ $n = 0;
- while ($feed_item = db_fetch_object($feed_items)) {
- $iid = md5($feed_item->title . $feed_item->url);
- db_query("UPDATE {simplefeed_feed_item} SET iid = '%s' WHERE vid = %d",
$iid, $feed_item->vid);
- $_SESSION['simplefeed_item_update_2']['vid'] = $feed_item->vid;
-+ $n++;
- }
-
-- if (db_num_rows($feed_items) == $limit) {
-+ if ($n == $limit) {
- $_SESSION['simplefeed_item_update_2']['count'] += $limit;
- // Return progress (never return 100% here to ensure clean-up is still
run last).
- return array('#finished' =>
$_SESSION['simplefeed_item_update_2']['vid'] /
($_SESSION['simplefeed_item_update_2']['max'] + 1));
@@ -60,8 +62,18 @@
function simplefeed_item_update_3() {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.368 -r1.369 drupal.spec
--- openpkg-src/drupal/drupal.spec 17 Oct 2008 17:41:22 -0000 1.368
+++ openpkg-src/drupal/drupal.spec 17 Oct 2008 18:20:51 -0000 1.369
@@ -25,7 +25,7 @@
%define V_drupal 6.5
# package versions (extension modules)
-%define V_module_acl 6.x-1.x-dev
+%define V_module_acl 6.x-1.0-beta2
%define V_module_activemenu 6.x-1.x-dev
%define V_module_activitystream 6.x-1.0-beta1
%define V_module_akismet 6.x-1.0-beta1
@@ -39,7 +39,7 @@
%define V_module_biblio 6.x-1.0-beta3
%define V_module_captcha 6.x-1.0-rc2
%define V_module_captcha_pack 6.x-1.0-beta1
-%define V_module_cck 6.x-2.0-rc8
+%define V_module_cck 6.x-2.0-rc10
%define V_module_cck_blocks 6.x-1.1
%define V_module_cck_fieldgroup_tabs 6.x-1.x-dev
%define V_module_citation_filter 6.x-2.0
@@ -69,7 +69,7 @@
%define V_module_faq 6.x-1.7
%define V_module_faq_ask 6.x-1.2
%define V_module_fasttoggle 6.x-1.3
-%define V_module_fckeditor 6.x-1.3-rc1
+%define V_module_fckeditor 6.x-1.3-rc3
%define V_module_feature 6.x-1.x-dev
%define V_module_feedapi 6.x-1.4
%define V_module_filebrowser 6.x-1.4
@@ -158,7 +158,7 @@
%define V_module_slideshow_creator 6.x-1.29
%define V_module_splash 6.x-2.3
%define V_module_stringoverrides 6.x-1.7
-%define V_module_subscriptions 6.x-1.x-dev
+%define V_module_subscriptions 6.x-1.0-beta3
%define V_module_supernav 6.x-1.0
%define V_module_switchtheme 6.x-1.0
%define V_module_table_altrow 6.x-1.1
@@ -182,7 +182,7 @@
%define V_module_twikifilter 6.x-1.x-dev
%define V_module_upload_image 6.x-1.x-dev
%define V_module_util 6.x-2.3
-%define V_module_views 6.x-2.0-rc4
+%define V_module_views 6.x-2.0-rc5
%define V_module_virtual_site 6.x-1.3
%define V_module_vocabindex 6.x-1.2
%define V_module_votingapi 6.x-2.0-rc1
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
