Merge lp:~legolas/ubuntu/natty/php-mcrypt/5.3.5 into lp:ubuntu/natty/php-mcrypt

Proposed by Stas Verberkt
Status: Work in progress
Proposed branch: lp:~legolas/ubuntu/natty/php-mcrypt/5.3.5
Merge into: lp:ubuntu/natty/php-mcrypt
Diff against target: 13 lines (+6/-0)
1 file modified
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~legolas/ubuntu/natty/php-mcrypt/5.3.5
Reviewer Review Type Date Requested Status
Stefan Lesicnik (community) Disapprove
Ubuntu branches Pending
Review via email: mp+48127@code.launchpad.net

Description of the change

Please note https://bugs.launchpad.net/ubuntu/+source/php5/+bug/708504. Also, please note that this module did not change between those PHP releases.

To post a comment you must log in.
Revision history for this message
Stefan Lesicnik (stefanlsd) wrote :

As per comments on Bug - we rather want to work with Debian on this. (This also doesnt seem like a proper merge as nothing but the changelog has changed)

review: Disapprove
Revision history for this message
Evan Broder (broder) wrote :

I'm marking the status of this merge proposal as "Work in progress". Please feel free to change it back to "Needs review" once you've addressed Stefan's concerns.

Unmerged revisions

14. By Stas Verberkt

Updated changelog.

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-08-13 07:52:23 +0000
3+++ debian/changelog 2011-02-01 10:04:16 +0000
4@@ -1,3 +1,9 @@
5+php-mcrypt (5.3.5-1ubuntu1) natty; urgency=low
6+
7+ * Updated to php 5.3.5
8+
9+ -- Stas Verberkt <legolas@legolasweb.nl> Wed, 26 Jan 2011 19:27:57 +0100
10+
11 php-mcrypt (5.3.3-0ubuntu2) maverick; urgency=low
12
13 * debian/rules: Fix FTBFS.

Subscribers

People subscribed via source and target branches

to all changes: