diff -u drupal5-5.20/debian/rules drupal5-5.20/debian/rules --- drupal5-5.20/debian/rules +++ drupal5-5.20/debian/rules @@ -42,7 +42,7 @@ install:build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs -X.svn -XCVS dh_install -XCVS -X.svn # fix permissions diff -u drupal5-5.20/debian/control drupal5-5.20/debian/control --- drupal5-5.20/debian/control +++ drupal5-5.20/debian/control @@ -1,7 +1,8 @@ Source: drupal5 Section: web Priority: extra -Maintainer: Luigi Gangitano +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Luigi Gangitano Build-Depends: debhelper (>= 4), dpatch Standards-Version: 3.8.3 Homepage: http://www.drupal.org @@ -10,7 +11,7 @@ Package: drupal5 Architecture: all -Depends: ${debconf-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 +Depends: ${debconf-depends}, ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, default-mta | mail-transport-agent | postfix, wwwconfig-common (>= 0.0.37), mysql-client | virtual-mysql-client | postgresql-client, dbconfig-common, curl Recommends: mysql-server | postgresql Description: a fully-featured content management framework Drupal is a dynamic web site platform which allows an individual or @@ -25 +25,0 @@ - diff -u drupal5-5.20/debian/changelog drupal5-5.20/debian/changelog --- drupal5-5.20/debian/changelog +++ drupal5-5.20/debian/changelog @@ -1,3 +1,19 @@ +drupal5 (5.20-1ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes (LP: #477387): + + debian/patches/21_SA-CORE-2009-008.dpatch: + - Remove, applied upstream. + + debian/control: + - Change binary deps to default-mta | mail-transport-agent | postfix. + + debian/README.source: + - Add for silence lintian's warning. + + debian/rules: + - Use dh_prop instead deprecated dh_clean -k + + debian/watch: + - Bump version from 2 to 3. + + -- Artur Rona Sun, 08 Nov 2009 19:39:09 +0100 + drupal5 (5.20-1) unstable; urgency=low * New upstream release (Closes: #543940) @@ -24,6 +40,25 @@ -- Luigi Gangitano Mon, 13 Jul 2009 18:20:08 +0200 +drupal5 (5.18-1.1ubuntu2) karmic; urgency=low + + * debian/patches/21_SA-CORE-2009-008.dpatch: + - Fixed security issues (session fixation), + see SA-CORE-2009-008 (LP: #431080). + * debian/README.source: Added for silence lintian's warning. + + -- Artur Rona Wed, 07 Oct 2009 17:32:47 +0200 + +drupal5 (5.18-1.1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Changed binary deps to default-mta | mail-transport-agent | postfix + + -- Stephan Hermann Tue, 07 Jul 2009 10:08:25 +0000 + drupal5 (5.18-1.1) unstable; urgency=high * Non-maintainer upload by the Security Team. @@ -32,6 +67,19 @@ -- Nico Golde Mon, 06 Jul 2009 20:24:02 +0200 +drupal5 (5.18-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + * Dropped changes: + + debian/control: + - Replace exim4 with postfix in Depends. + * debian/control: + - Changed binary deps to default-mta | mail-transport-agent | postfix + + -- Stephan Hermann Mon, 08 Jun 2009 09:43:24 +0000 + drupal5 (5.18-1) unstable; urgency=low [ Luigi Gangitano ] @@ -52,6 +100,18 @@ -- Nico Golde Thu, 28 May 2009 20:30:39 +0200 +drupal5 (5.17-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #375750 + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + + Fix for debian/watch. + - Bump version from 2 to 3 + + -- Bhavani Shankar Wed, 13 May 2009 05:20:16 +0530 + drupal5 (5.17-1) unstable; urgency=low [ Luigi Gangitano ] @@ -71,6 +131,19 @@ -- Luigi Gangitano Sun, 01 Mar 2009 18:25:39 +0100 +drupal5 (5.15-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #317774 + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Add Homepage field. + + Fix for debian/watch. + - Bump version from 2 to 3 + + -- Bhavani Shankar Fri, 16 Jan 2009 12:55:01 +0530 + drupal5 (5.15-1) unstable; urgency=low [ Luigi Gangitano ] @@ -79,6 +152,19 @@ -- Luigi Gangitano Fri, 16 Jan 2009 01:41:25 +0100 +drupal5 (5.14-1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #315544 + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Add Homepage field. + + Fix for debian/watch. + - Bump version from 2 to 3 + + -- Bhavani Shankar Fri, 09 Jan 2009 21:55:33 +0530 + drupal5 (5.14-1) unstable; urgency=low * New upstream release (Closes: #508472) @@ -94,6 +180,18 @@ -- Luigi Gangitano Thu, 08 Jan 2009 20:29:59 +0100 +drupal5 (5.12-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #304334) + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Fix for debian/watch. + - add Homepage field. + + -- Stefan Lesicnik Tue, 02 Dec 2008 11:31:44 +0200 + drupal5 (5.12-2) unstable; urgency=low * debian/control @@ -122,6 +220,19 @@ -- Luigi Gangitano Mon, 01 Dec 2008 00:09:54 +0100 +drupal5 (5.10-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Fix for debian/watch. + - Fixed lintian warnings. + - add Homepage field. + + -- Emanuele Gentili Fri, 07 Nov 2008 05:33:19 +0100 + drupal5 (5.10-3) unstable; urgency=high [Luigi Gangitano] @@ -164,6 +275,19 @@ -- Luigi Gangitano Fri, 14 Oct 2008 15:45:38 +0200 +drupal5 (5.10-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Fix for debian/watch. + - Fixed lintian warnings. + - add Homepage field. + + -- Emanuele Gentili Fri, 15 Aug 2008 16:15:10 +0200 + drupal5 (5.10-1) unstable; urgency=low [ Luigi Gangitano ] @@ -176,6 +300,30 @@ -- Luigi Gangitano Fri, 15 Aug 2008 01:35:50 +0200 +drupal5 (5.9-1ubuntu3) intrepid; urgency=low + + * debian/control: + + add Homepage field. + + -- Emanuele Gentili Tue, 12 Aug 2008 17:52:41 +0200 + +drupal5 (5.9-1ubuntu2) intrepid; urgency=low + + * Fix for debian/watch. + * fixed lintian warnings. + + -- Emanuele Gentili Sat, 09 Aug 2008 04:27:00 +0200 + +drupal5 (5.9-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + + -- Emanuele Gentili Fri, 25 Jul 2008 19:32:37 +0200 + drupal5 (5.9-1) unstable; urgency=high [ Luigi Gangitano ] @@ -187,6 +335,19 @@ -- Luigi Gangitano Thu, 24 Jul 2008 10:47:27 +0200 +drupal5 (5.8-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Modify Maintainer value to match DebianMaintainerField spec. + + debian/control: + - Update Standards Version. + + -- Emanuele Gentili Fri, 18 Jul 2008 02:41:35 +0200 + drupal5 (5.8-1) unstable; urgency=high [ Luigi Gangitano ] @@ -198,6 +359,17 @@ -- Luigi Gangitano Thu, 17 Jul 2008 15:36:46 +0200 +drupal5 (5.7-2ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: (LP: #237515) + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Emanuele Gentili Thu, 05 Jun 2008 04:20:22 +0200 + drupal5 (5.7-2) unstable; urgency=low [ Luigi Gangitano ] @@ -209,6 +381,17 @@ -- Luigi Gangitano Mon, 2 Jun 2008 19:14:12 +0100 +drupal5 (5.7-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes (LP: #191621): + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Emanuele Gentili Wed, 13 Feb 2008 18:37:02 +0100 + drupal5 (5.7-1) unstable; urgency=low [ Luigi Gangitano ] @@ -228,6 +411,17 @@ -- Luigi Gangitano Tue, 12 Feb 2008 11:40:29 +0100 +drupal5 (5.6-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes (LP: #182291): + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Emanuele Gentili Sun, 28 Jan 2008 19:01:55 +0000 + drupal5 (5.6-2) unstable; urgency=low [ Luigi Gangitano ] @@ -237,6 +431,17 @@ -- Luigi Gangitano Sat, 26 Jan 2008 20:51:39 +0100 +drupal5 (5.6-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes (LP: #182291): + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Emanuele Gentili Sat, 12 Jan 2008 14:00:18 +0100 + drupal5 (5.6-1) unstable; urgency=high [ Luigi Gangitano ] @@ -260,6 +465,17 @@ -- Luigi Gangitano Fri, 11 Jan 2008 15:02:09 +0100 +drupal5 (5.5-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Stephan Hermann Sun, 23 Dec 2007 11:48:06 +0100 + drupal5 (5.5-1) unstable; urgency=high [ Luigi Gangitano ] @@ -274,6 +490,17 @@ -- Luigi Gangitano Fri, 07 Dec 2007 21:29:18 +0100 +drupal5 (5.3-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + debian/control: + - Replace exim4 with postfix in Depends. + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Stephan Hermann Thu, 15 Nov 2007 08:54:10 +0100 + drupal5 (5.3-1) unstable; urgency=high [ Luigi Gangitano ] @@ -300,6 +527,13 @@ -- Luigi Gangitano Thu, 23 Aug 2007 15:44:15 +0200 +drupal5 (5.2-2ubuntu2) gutsy; urgency=low + + * debian/patches/02_htaccess: + - Add RewriteBase /drupal5 + + -- Ante Karamatic Sun, 30 Sep 2007 21:29:42 +0200 + drupal5 (5.2-2) unstable; urgency=low * debian/README.Debian @@ -310,6 +544,16 @@ -- Luigi Gangitano Fri, 27 Jul 2007 02:12:20 +0200 +drupal5 (5.2-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - Replace exim4 with postfix in Depends. + - Replace postgresql-server with postgresql-8.2 in Recommends. + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Michael Bienia Fri, 27 Jul 2007 20:14:39 +0200 + drupal5 (5.2-1) unstable; urgency=high [ Luigi Gangitano ] @@ -338,6 +582,20 @@ -- Luigi Gangitano Wed, 29 Jun 2007 21:39:33 +0200 +drupal5 (5.1-2ubuntu1) gutsy; urgency=low + + * debian/control: + - Replace apache with apache2, postgresql-client-8.1 with + postgresql-client-8.2 and exim4 with postfix in Depends + - Replace postgresql-server-8.1 | postgresl-server with postgresql-8.2 in + Recommends + - Remove all php4 dependencies. + - Rename Build-Depends-Indep to Build-Depends (both debhelper and dpatch + are needed for the clean target) + - Modify Maintainer value to match DebianMaintainerField spec. + + -- Michael Bienia Fri, 29 Jun 2007 12:31:10 +0200 + drupal5 (5.1-2) unstable; urgency=low [ Luigi Gangitano ] diff -u drupal5-5.20/debian/watch drupal5-5.20/debian/watch --- drupal5-5.20/debian/watch +++ drupal5-5.20/debian/watch @@ -1,2 +1,2 @@ -version=2 +version=3 http://ftp.osuosl.org/pub/drupal/files/projects/drupal-(5[\d\.]+)\.tar\.gz diff -u drupal5-5.20/debian/patches/00list drupal5-5.20/debian/patches/00list --- drupal5-5.20/debian/patches/00list +++ drupal5-5.20/debian/patches/00list @@ -1 +1,2 @@ +02_htaccess 10_cronjob only in patch2: unchanged: --- drupal5-5.20.orig/debian/README.source +++ drupal5-5.20/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. only in patch2: unchanged: --- drupal5-5.20.orig/debian/patches/02_htaccess.dpatch +++ drupal5-5.20/debian/patches/02_htaccess.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_htaccess.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: patch for allow modrewrite + +@DPATCH@ +diff -urNad drupal5-5.7~/.htaccess drupal5-5.7/.htaccess +--- drupal5-5.7~/.htaccess 2008-01-22 10:01:39.000000000 +0100 ++++ drupal5-5.7/.htaccess 2008-02-13 18:32:18.000000000 +0100 +@@ -86,7 +86,7 @@ + # VirtualDocumentRoot and the rewrite rules are not working properly. + # For example if your site is at http://example.com/drupal uncomment and + # modify the following line: +- # RewriteBase /drupal ++ RewriteBase /drupal5 + # + # If your site is running in a VirtualDocumentRoot at http://example.com/, + # uncomment the following line: