[Pkg-cli-apps-commits] [monodevelop-debugger-gdb] 01/01: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/monodevelop-debugger-gdb

[Jo Shields]

This is an automated email from the git hooks/post-receive script.

directhex pushed a commit to branch master
in repository monodevelop-debugger-gdb.

commit 0a3786bfc4d4dd41e326f4ef6316e86eb34b8aaf
Merge: 123ae36 cc3849d
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Oct 10 15:37:19 2013 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-cli-apps/packages/monodevelop-debugger-gdb
    
    Conflicts:
    	Manifest.addin.xml
    	configure
    	debian/changelog
    	debian/control
    	debian/rules

 configure        |    2 +-
 debian/changelog |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 870a155,c65d5c3..4cbf786
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,21 @@@
 +monodevelop-debugger-gdb (4.0.12-1) unstable; urgency=low
 +
 +  * [3e33bfb] Fix debian/watch for new upstream tarball naming scheme
 +  * [4958ff8] Imported Upstream version 4.0.12 (Closes: #708805)
 +  * [8f7621e] Build-Depend on corresponding version of MonoDevelop
 +  * [164bf52] delete monodevelop-debugger-gdb.spec in clean rule
 +  * [6d4c074] Set package dependencies to MD 4.0.12 (Closes: #710761)
 +
 + -- Jo Shields <directhex at apebox.org>  Thu, 10 Oct 2013 15:25:23 +0200
 +
+ monodevelop-debugger-gdb (3.0.3.2-1) unstable; urgency=low
+ 
+   * [6c614ea] Imported Upstream version 3.0.3.2
+   * [b8ba7d3] Bump required MonoDevelop version to 3.0.3.2.
+   * [9dc0e1b] Delete RPM spec file in clean rule, since configure generates it.
+ 
+  -- Jo Shields <directhex at apebox.org>  Sat, 23 Jun 2012 04:33:32 +0100
+ 
  monodevelop-debugger-gdb (3.0.2-1) unstable; urgency=low
  
    * [afa0d65] Imported Upstream version 3.0.2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/monodevelop-debugger-gdb.git