Merge pull request phpredis#269 from shtouff/debian

Michael Grunder · Michael Grunder · commit b991385672e9 · 2013-01-24T08:33:33.000-08:00
a small fix in debianization: conflict after package rename
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,10 @@
+php5-redis (2.2.2-1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Updating version from upstream
+
+ -- Rémi Paulmier <remi.paulmier@gmail.com>  Fri, 02 Nov 2012 10:30:28 +0100
+
 php5-redis (2.1.3-1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/control b/debian/control
@@ -10,4 +10,7 @@ Package: php5-redis
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${php5:Depends}
 Recommends: php5
+Provides: php5-redis
+Conflicts: phpredis
+Replaces: phpredis
 Description: Redis C extension for PHP5.
