Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Bump phpdbg version to PHP_VERSION

2 files changed, 1 insertions, 53 deletions

diff --git a/sapi/phpdbg/Changelog.md b/sapi/phpdbg/Changelog.md
deleted file mode 100644
index c5d8b51514..0000000000
--- a/sapi/phpdbg/Changelog.md
+++ /dev/null
@@ -1,52 +0,0 @@
-ChangeLog for phpdbg
-====================
-
-Version 0.3.0 2013-00-00
-------------------------
-
-1. Added ability to disable an enable a single breakpoint
-2. Added ability to override SAPI name
-3. Added extended conditional breakpoint support "break at"
-4. Fix loading of zend extnsions with -z
-5. Fix crash when loading .phpdbginit with command line switch
-6. Fix crash on startup errors
-7. Added init.d for remote console (redhat)
-8. Added phpdbg_exec userland function
-9. Added testing facilities
-10. Added break on n-th opline support
-11. Improved trace output
-
-Version 0.2.0 2013-11-31
-------------------------
-
-1. Added "break delete <id>" command
-2. Added "break opcode <opcode>" command
-3. Added "set" command - control prompt and console colors
-4. .phpdbginit now searched in (additional) ini dirs
-5. Added source command - load additional .phpdbginit script during session
-6. Added remote console mode
-7. Added info memory command
-
-Version 0.1.0 2013-11-23
-------------------------
-
-1. New commands:
-  - until    (continue until the current line is executed)
-  - frame    (switch to a frame in the current stack for inspection)
-  - info     (quick access to useful information on the console)
-  - finish   (continue until the current function has returned)
-  - leave    (continue until the current function is returning)
-  - shell    (shell a command)
-  - register (register a function for use as a command)
-2. Added printers for class and method
-3. Make uniform commands and aliases where possible
-4. Include all alias information and sub-command information in help
-5. Added signal handling to break execution (ctrl-c)
-6. Fixed #13 (Output Buffering Control seems fail)
-7. Fixed #14 (Fixed typo in Makefile.frag)
-
-
-Version 0.0.1 2013-11-15
-------------------------
-
-1. Initial features
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h
index 6d78033b5c..fb384ee55b 100644
--- a/sapi/phpdbg/phpdbg.h
+++ b/sapi/phpdbg/phpdbg.h
@@ -104,7 +104,7 @@
 #define PHPDBG_NAME "phpdbg"
 #define PHPDBG_AUTHORS "Felipe Pena, Joe Watkins and Bob Weinand" /* Ordered by last name */
 #define PHPDBG_ISSUES "http://bugs.php.net/report.php"
-#define PHPDBG_VERSION "0.5.0"
+#define PHPDBG_VERSION PHP_VERSION
 #define PHPDBG_INIT_FILENAME ".phpdbginit"
 #define PHPDBG_DEFAULT_PROMPT "prompt>"
 /* }}} */