[Pkg-drupal-commits] r1755 - in /branches/drupal-5.0/debian:
changelog control cron.sh dirs links rules templates.master
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Tue Jan 30 03:20:00 CET 2007
Author: luigi
Date: Tue Jan 30 03:19:59 2007
New Revision: 1755
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1755
Log:
Switch to drupal5 naming
Modified:
branches/drupal-5.0/debian/changelog
branches/drupal-5.0/debian/control
branches/drupal-5.0/debian/cron.sh
branches/drupal-5.0/debian/dirs
branches/drupal-5.0/debian/links
branches/drupal-5.0/debian/rules
branches/drupal-5.0/debian/templates.master
Modified: branches/drupal-5.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/changelog?rev=1755&op=diff
==============================================================================
--- branches/drupal-5.0/debian/changelog (original)
+++ branches/drupal-5.0/debian/changelog Tue Jan 30 03:19:59 2007
@@ -1,10 +1,10 @@
-drupal-5.0 (5.0-1) UNRELEASED; urgency=low
+drupal5 (5.0-1) UNRELEASED; urgency=low
* (NOT RELEASED YET) New upstream release
* debian/*
- - Rename file and directories from 4.7 to 5.0
- - In debian/control switch to Source: drupal-5.0
+ - Rename file and directories from 4.7 to 5
+ - In debian/control switch to Source: drupal5
- Add watch file
* debian/control
@@ -12,7 +12,7 @@
- Removed dependencies on apache and added dependency on httpd | apache
- Added dependency on php4-gd | php5-gd
- * debian/{rules,drupal-5.0.install}
+ * debian/{rules,drupal5.install}
- Removed reference to not-existing directory 'database'
* debian/patches/10_cronjob.dpatch
Modified: branches/drupal-5.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/control?rev=1755&op=diff
==============================================================================
--- branches/drupal-5.0/debian/control (original)
+++ branches/drupal-5.0/debian/control Tue Jan 30 03:19:59 2007
@@ -1,11 +1,11 @@
-Source: drupal-5.0
+Source: drupal5
Section: web
Priority: extra
Maintainer: Luigi Gangitano <luigi at debian.org>
Build-Depends-Indep: debhelper (>= 4), dpatch
Standards-Version: 3.7.2
-Package: drupal-5.0
+Package: drupal5
Architecture: all
Depends: ${debconf-depends}, httpd | apache, php4 | php5, php4-mysql | php4-pgsql | php5-mysql | php5-pgsql, php4-gd | php5-gd, exim4 | mail-transport-agent, wwwconfig-common (>= 0.0.37), mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client, dbconfig-common, curl
Recommends: mysql-server | postgresql-server-8.1 | postgresl-server
@@ -16,7 +16,7 @@
management systems, weblogs, collaborative tools and discussion-based
community software into one easy-to-use package.
.
- This package contains version 5.0 of Drupal.
+ This package contains version 5 of Drupal.
.
More information about is available at http://www.drupal.org
Modified: branches/drupal-5.0/debian/cron.sh
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/cron.sh?rev=1755&op=diff
==============================================================================
--- branches/drupal-5.0/debian/cron.sh (original)
+++ branches/drupal-5.0/debian/cron.sh Tue Jan 30 03:19:59 2007
@@ -1,10 +1,10 @@
#!/bin/sh
# $Id$
-for i in /etc/drupal/5.0/sites/*/settings.php ; do
+for i in /etc/drupal/5/sites/*/settings.php ; do
BASE_URL=`grep '^$base_url' $i | cut -d"'" -f2`
if [ "X$BASE_URL" = "X" ] ; then
- BASE_URL='http://localhost/drupal'
+ BASE_URL='http://localhost/drupal5'
fi
curl --silent --compressed $BASE_URL/cron.php
done
Modified: branches/drupal-5.0/debian/dirs
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/dirs?rev=1755&op=diff
==============================================================================
--- branches/drupal-5.0/debian/dirs (original)
+++ branches/drupal-5.0/debian/dirs Tue Jan 30 03:19:59 2007
@@ -1,6 +1,6 @@
-etc/drupal/5.0/sites/default
-var/lib/drupal-5.0/files
-var/lib/drupal-5.0/backups
-usr/share/doc/drupal-5.0
-usr/share/dbconfig-common/data/drupal-5.0/install
+etc/drupal/5/sites/default
+var/lib/drupal5/files
+var/lib/drupal5/backups
+usr/share/doc/drupal5
+usr/share/dbconfig-common/data/drupal5/install
usr/share/lintian/overrides
Modified: branches/drupal-5.0/debian/links
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/links?rev=1755&op=diff
==============================================================================
--- branches/drupal-5.0/debian/links (original)
+++ branches/drupal-5.0/debian/links Tue Jan 30 03:19:59 2007
@@ -1,3 +1,3 @@
-etc/drupal/5.0/htaccess usr/share/drupal-5.0/.htaccess
-etc/drupal/5.0/sites usr/share/drupal-5.0/sites
-var/lib/drupal-5.0/files usr/share/drupal-5.0/files
+etc/drupal/5/htaccess usr/share/drupal5/.htaccess
+etc/drupal/5/sites usr/share/drupal5/sites
+var/lib/drupal5/files usr/share/drupal5/files
Modified: branches/drupal-5.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/rules?rev=1755&op=diff
==============================================================================
--- branches/drupal-5.0/debian/rules (original)
+++ branches/drupal-5.0/debian/rules Tue Jan 30 03:19:59 2007
@@ -6,7 +6,7 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-PACKAGE=drupal-5.0
+PACKAGE=drupal5
include /usr/share/dpatch/dpatch.make
@@ -46,14 +46,14 @@
dh_installdirs -X.svn -XCVS
dh_install -XCVS -X.svn
# fix permissions
- find $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal-5.0/themes \
+ find $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal5/themes \
-name '*.png' -o -name '*.jpg' | xargs chmod a-x
- chmod +x $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal-5.0/scripts/*
+ chmod +x $(CURDIR)/debian/$(PACKAGE)/usr/share/drupal5/scripts/*
- install -m640 .htaccess debian/drupal-5.0/etc/drupal/5.0/htaccess
- #install -m644 database/database.4.1.mysql debian/drupal-5.0/usr/share/dbconfig-common/data/drupal-5.0/install/mysql
- #install -m644 database/database.pgsql debian/drupal-5.0/usr/share/dbconfig-common/data/drupal-5.0/install/pgsql
- install -m644 debian/drupal-5.0.lintian debian/drupal-5.0/usr/share/lintian/overrides/drupal-5.0
+ install -m640 .htaccess debian/drupal5/etc/drupal/5/htaccess
+ #install -m644 database/database.4.1.mysql debian/drupal5/usr/share/dbconfig-common/data/drupal5/install/mysql
+ #install -m644 database/database.pgsql debian/drupal5/usr/share/dbconfig-common/data/drupal5/install/pgsql
+ install -m644 debian/drupal5.lintian debian/drupal5/usr/share/lintian/overrides/drupal5
# Everything else is handled by dh_install
# Build architecture-independent files here.
Modified: branches/drupal-5.0/debian/templates.master
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/templates.master?rev=1755&op=diff
==============================================================================
--- branches/drupal-5.0/debian/templates.master (original)
+++ branches/drupal-5.0/debian/templates.master Tue Jan 30 03:19:59 2007
@@ -1,4 +1,4 @@
-Template: drupal-5.0/webserver
+Template: drupal5/webserver
Type: multiselect
Choices: apache, apache-ssl, apache-perl, apache2
Default: apache
More information about the Pkg-drupal-commits
mailing list