[Pkg-virtualbox-commits] [virtualbox-guest-additions-iso] 01/01: Merge branch 'jessie'

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to branch master
in repository virtualbox-guest-additions-iso.

commit a8cd6b1caae35cd32c8198d610baa521d60e7b99
Merge: 619ecc4 be5c88a
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Mar 27 13:37:03 2015 +0100

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --cc debian/changelog
index d8b8a85,09af2fb..ac2ae10
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,10 +1,36 @@@
 +virtualbox-guest-additions-iso (4.3.26-1) experimental; urgency=medium
 +
 +   * New upstream release.
 +   * Conflict with upstream proprietary packages 4.3 series.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 17 Mar 2015 08:33:50 +0100
 +
 +virtualbox-guest-additions-iso (4.3.24-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 03 Mar 2015 14:14:59 +0100
 +
 +virtualbox-guest-additions-iso (4.3.22-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +  * Update copyright year.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Fri, 13 Feb 2015 12:01:27 +0100
 +
 +virtualbox-guest-additions-iso (4.3.20-1) experimental; urgency=medium
 +
 +  * New upstream release.
 +
 + -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 03 Dec 2014 09:55:53 +0100
 +
+ virtualbox-guest-additions-iso (4.3.18-3) unstable; urgency=high
+ 
+   * Reuploading the previous package, the -2 got removed because of
+     missing arch=all package.
+ 
+  -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 21 Mar 2015 22:23:17 +0100
+ 
  virtualbox-guest-additions-iso (4.3.18-2) unstable; urgency=medium
  
    * Conflict with upstream proprietary packages 4.3 series.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox-guest-additions-iso.git