Ubuntu
php5 package

Merge lp:~ubuntu-branches/ubuntu/lucid/php5/lucid-201002130000 into lp:ubuntu/lucid/php5

  1. Lucid (10.04)
  2. lucid-201002130000
  3. Merge into lucid
Proposed by James Westby
Status: Needs review
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/php5/lucid-201002130000
Merge into: lp:ubuntu/lucid/php5
Diff against target: 88 lines (+66/-0) (has conflicts)
2 files modified
debian/changelog (+9/-0)
debian/source_php5.py (+57/-0)
Text conflict in debian/changelog
Conflict adding file debian/source_php5.py.  Moved existing file to debian/source_php5.py.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/php5/lucid-201002130000
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/php5 now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/php5/lucid-201002130000. A merge should be performed if necessary.

Reply

Unmerged revisions

55. By Chuck Short

debian/rules, debian/source_php5.py: Install apport hook.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-04 14:57:16 +0000
3+++ debian/changelog 2010-02-13 00:19:16 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 php5 (5.2.12.dfsg.1-2ubuntu2) lucid; urgency=low
7
8 * debian/control: Fix FTBFS.
9@@ -79,6 +80,14 @@
10
11 -- Chuck Short <zulcss@ubuntu.com> Tue, 19 Jan 2010 10:22:30 -0500
12
13+=======
14+php5 (5.2.11.dfsg.1-2ubuntu2) lucid; urgency=low
15+
16+ * debian/rules, debian/source_php5.py: Install apport hook.
17+
18+ -- Chuck Short <zulcss@ubuntu.com> Tue, 19 Jan 2010 10:22:30 -0500
19+
20+>>>>>>> MERGE-SOURCE
21 php5 (5.2.11.dfsg.1-2ubuntu1) lucid; urgency=low
22
23 * Merge from debian unstable, remaining changes:
24
25=== modified file 'debian/rules'
26=== added file 'debian/source_php5.py'
27--- debian/source_php5.py 1970-01-01 00:00:00 +0000
28+++ debian/source_php5.py 2010-02-13 00:19:16 +0000
29@@ -0,0 +1,57 @@
30+#!/usr/bin/python
31+
32+'''PHP5 Apport interface
33+
34+Copyright (C) 2010 Canonical Ltd.
35+Author: Chuck Short <chuck.short@canonical.com>
36+
37+This program is free software; you can redistribute it and/or modify it
38+under the terms of the GNU General Public License as published by the
39+Free Software Foundation; either version 2 of the License, or (at your
40+option) any later version. See http://www.gnu.org/copyleft/gpl.html for
41+the full text of the license.
42+'''
43+
44+import os
45+import subprocess
46+from apport.hookutils import *
47+
48+def _add_my_conf_files(report, filename):
49+ if not os.path.exists(filename):
50+ return
51+
52+ key = 'PHPConf' + path_to_key(filename)
53+ report[key] = ""
54+ for line in read_file(filename).split('\n'):
55+ try:
56+ if 'mysql.default_password ' in line.split('=')[0]:
57+ line = "%s = @@APPORTREPLACED@@" % (line.split('=')[0])
58+ if 'mysqli.default_pw ' in line.split('=')[0]:
59+ line = "%s = @@APPORTREPLACED@@" % (line.split('=')[0])
60+ if 'ifx.default_password ' in line.split('=')[0]:
61+ line = "%s = @@APPORTREPLACED@@" % (line.split('=')[0])
62+ report[key] += line + '\n'
63+ except IndexError:
64+ continue
65+
66+def add_info(report):
67+ _add_my_conf_files(report, '/etc/php5/apache2/php.ini')
68+ _add_my_conf_files(report, '/etc/php5/cli/php5.ini')
69+
70+ # packages in main
71+ packages=['php5', 'php-common', 'libapache2-mod-php5', 'libapache2-mod-php5filter'
72+ 'php5-cgi', 'php5-cli', 'php5-dev', 'php5-dbg', 'php-pear', 'php5-curl', 'php5-gd'
73+ 'php5-gmp', 'php5-ldap', 'php5-mhash', 'php5-mysql', 'php5-odbc', 'php5-pgsql',
74+ 'php5-pspell', 'php5-recode', 'php5-snmp', 'php5-sqlite', 'php5-sybase', 'php5-tidy',
75+ 'php5-xmlrpc', 'php5-xsl']
76+
77+ versions = ''
78+ for package in packages:
79+ try:
80+ version = packaging.get_version(package)
81+ except ValueError:
82+ version = 'N/A'
83+ if version is None:
84+ version = 'N/A'
85+ versions += '%s %s\n' %(package, version)
86+ report['PHPInstalledModules'] = versions
87
88=== renamed file 'debian/source_php5.py' => 'debian/source_php5.py.moved'

Subscribers

People subscribed via source and target branches

to all changes: