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: 11-Dec-2008 08:10:10
Branch: HEAD Handle: 2008121107100700
Modified files:
openpkg-src/drupal drupal.patch drupal.spec
Log:
upgrading package: drupal 6.6 -> 6.7
Summary:
Revision Changes Path
1.35 +1 -10 openpkg-src/drupal/drupal.patch
1.404 +2 -2 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.34 -r1.35 drupal.patch
--- openpkg-src/drupal/drupal.patch 17 Oct 2008 18:20:51 -0000 1.34
+++ openpkg-src/drupal/drupal.patch 11 Dec 2008 07:10:07 -0000 1.35
@@ -143,15 +143,6 @@
foreach ($headers as $header => $value) {
$defaults[$header] = $header .': '. $value;
}
-@@ -1805,7 +1832,7 @@
- $last = '';
- while ($path != $last) {
- $last = $path;
-- $path = preg_replace('`(^|/)(?!../)([^/]+)/../`', '$1', $path);
-+ $path = preg_replace('`(^|/)(?!\.\./)([^/]+)/\.\./`', '$1', $path);
- }
- return 'url('. $path .')';
- }
Index: modules/system/system.admin.inc
--- modules/system/system.admin.inc.orig 2008-03-25 12:58:16 +0100
+++ modules/system/system.admin.inc 2008-04-24 11:43:07 +0200
@@ -327,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.34 2008/10/17 18:20:51 rse Exp $ */
++/* $Id: drupal.patch,v 1.35 2008/12/11 07:10:07 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.403 -r1.404 drupal.spec
--- openpkg-src/drupal/drupal.spec 9 Dec 2008 07:38:42 -0000 1.403
+++ openpkg-src/drupal/drupal.spec 11 Dec 2008 07:10:07 -0000 1.404
@@ -22,7 +22,7 @@
##
# package versions (core)
-%define V_drupal 6.6
+%define V_drupal 6.7
# package versions (extension modules)
%define V_module_acl 6.x-1.0-beta2
@@ -231,7 +231,7 @@
Group: CMS
License: GPL
Version: %{V_drupal}
-Release: 20081209
+Release: 20081211
# package options
%option with_mysql yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
