@@ -1,28 +1,25 @@
--- php5-xdebug.changes.orig
+++ php5-xdebug.changes
-@@ -1,4 +1,9 @@
+@@ -4,6 +4,7 @@ Fri Dec 9 07:25:35 UTC 2016 - cs@linux-
+ - update to release 2.5.0
+
-------------------------------------------------------------------
-+Fri Dec 9 07:24:57 UTC 2016 - cs@linux-administrator.com
-+
-+- update to release 2.5.0
-+
-+-------------------------------------------------------------------
++>>>>>>> .new
Tue Apr 19 10:00:28 UTC 2016 - cs@linux-administrator.com
- update to release 2.4.0
--- php5-xdebug.spec.orig
+++ php5-xdebug.spec
-@@ -1,22 +1,22 @@
+@@ -1,7 +1,7 @@
# norootforbuild
%define pkg_name xdebug
#
-Name: php5-xdebug
--Version: 2.4.0
+Name: php7-xdebug
-+Version: 2.5.0
+ Version: 2.5.0
Release: 1
#
- License: BSD
+@@ -9,14 +9,14 @@ License: BSD
Group: Productivity/Networking/Web/Servers
#
BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-build
|