[Pkg-drupal-commits] r2123 - in /branches/drupal7/debian: ./ etc/ patches/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Tue Mar 2 22:11:41 UTC 2010
Author: luigi
Date: Tue Mar 2 22:11:39 2010
New Revision: 2123
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=2123
Log:
Merge debian changes from drupal6 branch
Added:
branches/drupal7/debian/
- copied from r2122, branches/drupal6/debian/
branches/drupal7/debian/drupal7.config
- copied, changed from r2122, branches/drupal6/debian/drupal6.config
branches/drupal7/debian/drupal7.install
- copied, changed from r2122, branches/drupal6/debian/drupal6.install
branches/drupal7/debian/drupal7.lintian
- copied, changed from r2122, branches/drupal6/debian/drupal6.lintian
branches/drupal7/debian/drupal7.postinst
- copied, changed from r2122, branches/drupal6/debian/drupal6.postinst
branches/drupal7/debian/drupal7.postrm
- copied, changed from r2122, branches/drupal6/debian/drupal6.postrm
branches/drupal7/debian/drupal7.prerm
- copied, changed from r2122, branches/drupal6/debian/drupal6.prerm
Modified:
branches/drupal7/debian/README.Debian
branches/drupal7/debian/changelog
branches/drupal7/debian/control
branches/drupal7/debian/cron.d
branches/drupal7/debian/cron.sh
branches/drupal7/debian/dirs
branches/drupal7/debian/etc/apache.conf
branches/drupal7/debian/links
branches/drupal7/debian/patches/00list
branches/drupal7/debian/patches/10_cronjob.dpatch
branches/drupal7/debian/rules
branches/drupal7/debian/watch
Modified: branches/drupal7/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/README.Debian?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/README.Debian (original)
+++ branches/drupal7/debian/README.Debian Tue Mar 2 22:11:39 2010
@@ -35,7 +35,7 @@
database at installation time or if automatic creation failed.
Directions on how to create a database for you drupal portal can be found
-in INSTALL.mysql.txt and INSTALL.pgsql.txt files in /usr/share/doc/drupal6.
+in INSTALL.mysql.txt and INSTALL.pgsql.txt files in /usr/share/doc/drupal7.
3. Database population script
@@ -45,7 +45,7 @@
This can be done running the install.php script on portal web site, e.g.
- http://localhost/drupal6/install.php
+ http://localhost/drupal7/install.php
4. Deleting the Drupal database
@@ -56,7 +56,7 @@
If you want to purge the data stored at MySQl database manually you
can use the following command:
-'mysqladmin -p drop drupal6'
+'mysqladmin -p drop drupal7'
being the user who admin MySQL.
@@ -71,7 +71,7 @@
You can tell Drupal to use "clean URLs", eliminating the "?q=" in internal
URLs, simply enabling mod_rewrite in apache 2 configuration (a2enmod rewrite).
-Please note that you may need to adjust the /etc/drupal/6/htaccess
+Please note that you may need to adjust the /etc/drupal/7/htaccess
configuration file to match your site configuration.
@@ -79,7 +79,7 @@
-----------------------
It is very good security measure to restrict access to admin.php only
to trusted IP's and localhost (you can see an example at
-/etc/drupal/6/htaccess) As an added security measure, is a good idea to
+/etc/drupal/7/htaccess) As an added security measure, is a good idea to
set up a ssl-enabled web server in your apache, and allow access to
admin page only to ssl streams.
@@ -103,7 +103,7 @@
8. Virtual hosts
----------------
Drupal supports a setup with multiple virtual hosts. Each virtual host
-has its own configuration directory in /etc/drupal/6/sites/_virtualhost_.
+has its own configuration directory in /etc/drupal/7/sites/_virtualhost_.
At install time the 'default' virtual host is created with the required
settings.php configuration file.
@@ -125,8 +125,8 @@
directory that won't be touched by dpkg, e.g. in the /usr/local
hierarchy:
- # ln -s /usr/local/share/drupal/modules /usr/share/drupal6/modules/local
- # ln -s /usr/local/share/drupal/themes /usr/share/drupal6/themes/local
+ # ln -s /usr/local/share/drupal/modules /usr/share/drupal7/modules/local
+ # ln -s /usr/local/share/drupal/themes /usr/share/drupal7/themes/local
10. Privacy of session cookies
@@ -139,7 +139,7 @@
If you are using drupal on an https connection you can fix this issue
setting the session.cookie_secure PHP properties to on either in the
global PHP configuration file or adding the following line to
-/etc/drupal/6/htaccess:
+/etc/drupal/7/htaccess:
php_value session.cookie_secure 1
@@ -149,7 +149,7 @@
To create or customize a theme for your site, I recommend to start
with an existing theme (as exmaple), copy it to a different location
- # cp -ai /etc/drupal/6/themes/example /etc/drupal/6/themes/Custom
+ # cp -ai /etc/drupal/7/themes/example /etc/drupal/7/themes/Custom
and modify this new created theme. You can now select your "Custom"
theme in the Preferences menu from the admin interface.
Modified: branches/drupal7/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/changelog?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/changelog (original)
+++ branches/drupal7/debian/changelog Tue Mar 2 22:11:39 2010
@@ -1,3 +1,15 @@
+drupal7 (7.0~alpha2-1) UNRELEASED; urgency=low
+
+ [ Luigi Gangitano ]
+ * New upstream branch 7.0
+
+ * debian/*
+ - Rename file and directories from 6 to 7
+ - In debian/control switch to Source: drupal7
+
+ -- Luigi Gangitano <luigi at debian.org> Tue, 3 Mar 2010 22:59:34 +0100
+
+
drupal6 (6.15-2) UNRELEASED; urgency=low
[ Alexandre De Dommelin ]
Modified: branches/drupal7/debian/control
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/control?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/control (original)
+++ branches/drupal7/debian/control Tue Mar 2 22:11:39 2010
@@ -1,14 +1,14 @@
-Source: drupal6
+Source: drupal7
Section: web
Priority: extra
Maintainer: Luigi Gangitano <luigi at debian.org>
Build-Depends: debhelper (>= 7), dpatch
Homepage: http://www.drupal.org/
Standards-Version: 3.8.4
-Xs-Vcs-Svn: svn://alioth.debian.org/svn/pkg-drupal/branches/drupal6
-Xs-Vcs-Browser: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal6
+Xs-Vcs-Svn: svn://alioth.debian.org/svn/pkg-drupal/branches/drupal7
+Xs-Vcs-Browser: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7
-Package: drupal6
+Package: drupal7
Architecture: all
Depends: ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, exim4 | mail-transport-agent, wwwconfig-common (>= 0.0.37), mysql-client | virtual-mysql-client | postgresql-client, dbconfig-common, curl
Recommends: mysql-server | postgresql
@@ -19,5 +19,5 @@
management systems, weblogs, collaborative tools and discussion-based
community software into one easy-to-use package.
.
- This package contains version 6 of Drupal.
+ This package contains version 7 of Drupal.
Modified: branches/drupal7/debian/cron.d
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/cron.d?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/cron.d (original)
+++ branches/drupal7/debian/cron.d Tue Mar 2 22:11:39 2010
@@ -1,1 +1,1 @@
-0 * * * * www-data [ -x /usr/share/drupal6/scripts/cron.sh ] && /usr/share/drupal6/scripts/cron.sh
+0 * * * * www-data [ -x /usr/share/drupal7/scripts/cron.sh ] && /usr/share/drupal7/scripts/cron.sh
Modified: branches/drupal7/debian/cron.sh
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/cron.sh?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/cron.sh (original)
+++ branches/drupal7/debian/cron.sh Tue Mar 2 22:11:39 2010
@@ -1,7 +1,7 @@
#!/bin/sh
# $Id: cron.sh 1878 2008-02-12 10:56:45Z luigi $
-for site in /etc/drupal/6/sites/* ; do
+for site in /etc/drupal/7/sites/* ; do
BASE_URL=""
if [ ! "`basename $site`" = "all" ]; then
@@ -11,7 +11,7 @@
done
if [ "X$BASE_URL" = "X" ] ; then
- BASE_URL='http://localhost/drupal6'
+ BASE_URL='http://localhost/drupal7'
fi
curl --silent --compressed --location $BASE_URL/cron.php
Modified: branches/drupal7/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/dirs?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/dirs (original)
+++ branches/drupal7/debian/dirs Tue Mar 2 22:11:39 2010
@@ -1,5 +1,5 @@
-etc/drupal/6/sites/default
-var/lib/drupal6/files
-var/lib/drupal6/backups
-usr/share/doc/drupal6
+etc/drupal/7/sites/default
+var/lib/drupal7/files
+var/lib/drupal7/backups
+usr/share/doc/drupal7
usr/share/lintian/overrides
Copied: branches/drupal7/debian/drupal7.config (from r2122, branches/drupal6/debian/drupal6.config)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.config?rev=2123&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.config (original)
+++ branches/drupal7/debian/drupal7.config Tue Mar 2 22:11:39 2010
@@ -11,12 +11,12 @@
if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
# we support mysql and pgsql
dbc_dbtypes="mysql, pgsql"
- dbc_dbname=drupal6
- dbc_dbuser=drupal6
+ dbc_dbname=drupal7
+ dbc_dbuser=drupal7
# source dbconfig-common stuff
. /usr/share/dbconfig-common/dpkg/config --debconf-ok
- dbc_go drupal6 $@
+ dbc_go drupal7 $@
fi
if [ "$DPKG_DEBUG" = "developer" ]; then
@@ -26,12 +26,12 @@
##################################################
# Begin installation directories definition block#
##################################################
-package_name="drupal6"
+package_name="drupal7"
datadir="/var/lib/${package_name}"
backupdir="${datadir}/backups/"
docdir="/usr/share/doc/${package_name}"
upgradesdir="${docdir}/upgrades"
-configdir="/etc/drupal/6"
+configdir="/etc/drupal/7"
configfile="${configdir}/conf.php"
includefile="${configdir}/apache.conf"
################################################
Copied: branches/drupal7/debian/drupal7.install (from r2122, branches/drupal6/debian/drupal6.install)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.install?rev=2123&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.install (original)
+++ branches/drupal7/debian/drupal7.install Tue Mar 2 22:11:39 2010
@@ -1,10 +1,10 @@
-*.php usr/share/drupal6
-includes usr/share/drupal6
-misc usr/share/drupal6
-modules usr/share/drupal6
-themes usr/share/drupal6
-robots.txt usr/share/drupal6
-profiles etc/drupal/6
-debian/etc/apache.conf etc/drupal/6
-debian/etc/settings.php etc/drupal/6/sites/default
-debian/cron.sh usr/share/drupal6/scripts
+*.php usr/share/drupal7
+includes usr/share/drupal7
+misc usr/share/drupal7
+modules usr/share/drupal7
+themes usr/share/drupal7
+robots.txt usr/share/drupal7
+profiles etc/drupal/7
+debian/etc/apache.conf etc/drupal/7
+debian/etc/settings.php etc/drupal/7/sites/default
+debian/cron.sh usr/share/drupal7/scripts
Copied: branches/drupal7/debian/drupal7.lintian (from r2122, branches/drupal6/debian/drupal6.lintian)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.lintian?rev=2123&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.lintian (original)
+++ branches/drupal7/debian/drupal7.lintian Tue Mar 2 22:11:39 2010
@@ -1,2 +1,2 @@
-drupal6: package-contains-upstream-install-documentation usr/share/doc/drupal6/INSTALL.mysql.txt
-drupal6: package-contains-upstream-install-documentation usr/share/doc/drupal6/INSTALL.pgsql.txt
+drupal7: package-contains-upstream-install-documentation usr/share/doc/drupal7/INSTALL.mysql.txt
+drupal7: package-contains-upstream-install-documentation usr/share/doc/drupal7/INSTALL.pgsql.txt
Copied: branches/drupal7/debian/drupal7.postinst (from r2122, branches/drupal6/debian/drupal6.postinst)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postinst?rev=2123&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.postinst (original)
+++ branches/drupal7/debian/drupal7.postinst Tue Mar 2 22:11:39 2010
@@ -3,7 +3,7 @@
set -e
-dbc_generate_include='php:/etc/drupal/6/sites/default/dbconfig.php'
+dbc_generate_include='php:/etc/drupal/7/sites/default/dbconfig.php'
dbc_generate_include_owner='root:www-data'
dbc_generate_include_perms='640'
dbc_pgsql_createdb_encoding='UTF8'
@@ -11,20 +11,20 @@
. /usr/share/debconf/confmodule
# source dbconfig-common stuff');
. /usr/share/dbconfig-common/dpkg/postinst
-dbc_go drupal6 $@
+dbc_go drupal7 $@
if [ "$DPKG_DEBUG" = "developer" ]; then
set -x
fi
-package_name="drupal6"
+package_name="drupal7"
datadir="/var/lib/${package_name}"
filesdir="${datadir}/files"
backupdir="${datadir}/backups"
pkgdir="/usr/share/${package_name}"
docdir="/usr/share/doc/${package_name}"
upgradesdir="${docdir}/upgrades"
-configdir="/etc/drupal/6"
+configdir="/etc/drupal/7"
default_configfile="${configdir}/sites/default/settings.php"
includefile="${configdir}/apache.conf"
cronfile="/etc/cron.d/${package_name}"
@@ -42,8 +42,8 @@
if [ ! -d /etc/$webserver/conf.d/ ]; then
install -d -m755 /etc/$webserver/conf.d/
fi
- if [ ! -e /etc/$webserver/conf.d/drupal6.conf ]; then
- ln -s ${includefile} /etc/$webserver/conf.d/drupal6.conf
+ if [ ! -e /etc/$webserver/conf.d/drupal7.conf ]; then
+ ln -s ${includefile} /etc/$webserver/conf.d/drupal7.conf
restart="$i $restart"
fi
Copied: branches/drupal7/debian/drupal7.postrm (from r2122, branches/drupal6/debian/drupal6.postrm)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.postrm?rev=2123&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.postrm (original)
+++ branches/drupal7/debian/drupal7.postrm Tue Mar 2 22:11:39 2010
@@ -11,7 +11,7 @@
# source dbconfig-common stuff
if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
. /usr/share/dbconfig-common/dpkg/postrm
- dbc_go drupal6 $@
+ dbc_go drupal7 $@
fi
# summary of how this script can be called:
@@ -30,14 +30,14 @@
set -x
fi
-package_name="drupal6"
+package_name="drupal7"
datadir="/var/lib/${package_name}/"
backupdir="${datadir}backups/"
nukedir="/usr/share/${package_name}/"
docdir="/usr/share/doc/${package_name}/"
sqlfile="${docdir}database/database.mysql"
upgradesdir="${docdir}upgrades/"
-configdir="/etc/drupal/6/"
+configdir="/etc/drupal/7/"
configfile="${configdir}conf.php"
includefile="${configdir}apache.conf"
dbconfigfile="${configdir}/sites/default/dbconfig.php"
@@ -49,8 +49,8 @@
purge|remove)
# Un-configure webservers
- if [ -L /etc/$webserver/conf.d/drupal6.conf ]; then
- rm -f /etc/$webserver/conf.d/drupal6.conf || true
+ if [ -L /etc/$webserver/conf.d/drupal7.conf ]; then
+ rm -f /etc/$webserver/conf.d/drupal7.conf || true
restart="$i $restart"
fi
Copied: branches/drupal7/debian/drupal7.prerm (from r2122, branches/drupal6/debian/drupal6.prerm)
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/drupal7.prerm?rev=2123&op=diff
==============================================================================
--- branches/drupal6/debian/drupal6.prerm (original)
+++ branches/drupal7/debian/drupal7.prerm Tue Mar 2 22:11:39 2010
@@ -6,7 +6,7 @@
. /usr/share/debconf/confmodule
. /usr/share/dbconfig-common/dpkg/prerm
-dbc_go drupal6 $@
+dbc_go drupal7 $@
#DEBHELPER#
Modified: branches/drupal7/debian/etc/apache.conf
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/etc/apache.conf?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/etc/apache.conf (original)
+++ branches/drupal7/debian/etc/apache.conf Tue Mar 2 22:11:39 2010
@@ -1,6 +1,6 @@
-Alias /drupal6 /usr/share/drupal6
+Alias /drupal7 /usr/share/drupal7
-<Directory /usr/share/drupal6/>
+<Directory /usr/share/drupal7/>
Options +FollowSymLinks
AllowOverride All
order allow,deny
Modified: branches/drupal7/debian/links
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/links?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/links (original)
+++ branches/drupal7/debian/links Tue Mar 2 22:11:39 2010
@@ -1,4 +1,4 @@
-etc/drupal/6/htaccess usr/share/drupal6/.htaccess
-etc/drupal/6/sites usr/share/drupal6/sites
-etc/drupal/6/profiles usr/share/drupal6/profiles
-var/lib/drupal6/files etc/drupal/6/sites/default/files
+etc/drupal/7/htaccess usr/share/drupal7/.htaccess
+etc/drupal/7/sites usr/share/drupal7/sites
+etc/drupal/7/profiles usr/share/drupal7/profiles
+var/lib/drupal7/files etc/drupal/7/sites/default/files
Modified: branches/drupal7/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/patches/00list?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/patches/00list (original)
+++ branches/drupal7/debian/patches/00list Tue Mar 2 22:11:39 2010
@@ -1,2 +1,1 @@
10_cronjob
-20_drupal_core_updates
Modified: branches/drupal7/debian/patches/10_cronjob.dpatch
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/patches/10_cronjob.dpatch?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/patches/10_cronjob.dpatch (original)
+++ branches/drupal7/debian/patches/10_cronjob.dpatch Tue Mar 2 22:11:39 2010
@@ -5,13 +5,13 @@
## DP: Disable reporting to system log every cron run
@DPATCH@
-diff -urNad drupal6~/includes/common.inc drupal6/includes/common.inc
---- drupal6~/includes/common.inc 2008-02-18 12:32:44.000000000 +0100
-+++ drupal6/includes/common.inc 2008-02-18 12:37:09.000000000 +0100
-@@ -2540,7 +2540,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' drupal7~/includes/common.inc drupal7/includes/common.inc
+--- drupal7~/includes/common.inc 2010-02-20 15:39:51.000000000 +0100
++++ drupal7/includes/common.inc 2010-03-02 16:43:12.000000000 +0100
+@@ -4139,7 +4139,7 @@
// Record cron time
- variable_set('cron_last', time());
+ variable_set('cron_last', REQUEST_TIME);
- watchdog('cron', 'Cron run completed.', array(), WATCHDOG_NOTICE);
+ #watchdog('cron', 'Cron run completed.', array(), WATCHDOG_NOTICE);
Modified: branches/drupal7/debian/rules
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/rules?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/rules (original)
+++ branches/drupal7/debian/rules Tue Mar 2 22:11:39 2010
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-PACKAGE=drupal6
+PACKAGE=drupal7
include /usr/share/dpatch/dpatch.make
@@ -26,13 +26,13 @@
dh_installdirs -X.svn -XCVS
dh_install -XCVS -X.svn
# fix permissions
- find $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal6 \
+ find $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal7 \
-name '*.png' -o -name '*.jpg' | xargs chmod a-x
- chmod +x $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal6/scripts/*
- # rm $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal6/misc/jquery.js
+ chmod +x $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal7/scripts/*
+ # rm $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal7/misc/jquery.js
- install -m640 .htaccess debian/drupal6/etc/drupal/6/htaccess
- install -m644 debian/drupal6.lintian debian/drupal6/usr/share/lintian/overrides/drupal6
+ install -m640 .htaccess debian/drupal7/etc/drupal/7/htaccess
+ install -m644 debian/drupal7.lintian debian/drupal7/usr/share/lintian/overrides/drupal7
# Everything else is handled by dh_install
# Build architecture-independent files here.
Modified: branches/drupal7/debian/watch
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal7/debian/watch?rev=2123&op=diff
==============================================================================
--- branches/drupal7/debian/watch (original)
+++ branches/drupal7/debian/watch Tue Mar 2 22:11:39 2010
@@ -1,2 +1,2 @@
version=2
-http://ftp.osuosl.org/pub/drupal/files/projects/drupal-(6[\d\.]+)\.tar\.gz
+http://ftp.osuosl.org/pub/drupal/files/projects/drupal-(7[\d\.]+)\.tar\.gz
More information about the Pkg-drupal-commits
mailing list