[calculix-ccx] 04/04: Merge branch 'master' of git.debian.org:/git/debian-science/packages/calculix-ccx

[Wolfgang Fütterer]

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

wlfuetter-guest pushed a commit to branch master
in repository calculix-ccx.

commit d393607692fbeb6faccb9ef8626fca9878ea1e96
Merge: b653a23 90e4d05
Author: Wolfgang Fuetterer <debian at wlf-online.de>
Date:   Wed Apr 29 15:32:03 2015 +0200

    Merge branch 'master' of git.debian.org:/git/debian-science/packages/calculix-ccx
    
    Conflicts:
    	debian/changelog

 debian/changelog | 18 ++----------------
 debian/control   |  5 +++--
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index a915bdf,ca10a5e..3bb6bc3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,4 +1,11 @@@
 +calculix-ccx (2.8p2-1) UNRELEASED; urgency=medium
 +
 +  * New upstream version 2.8p2
 +  * Added autopkgtest
 +
 + -- Wolfgang Fuetterer <debian at wlf-online.de>  Wed, 29 Apr 2015 14:11:47 +0200
 +
- calculix-ccx (2.8p1-1) unstable; urgency=medium
- 
-   [ Anton Gladky ]
-   * [9899c30] Fix watch-file.
- 
-   [ Wolfgang Fuetterer ]
-   * [5e12db7] Imported Upstream version 2.8p1
-   * [a426212] Update version number to current version in some files
-   * [0fe8570] Added README.source to document the generation of the orig.tar file
-   * [046d2b4] Add build patch for debian for new version
-   * [4dbb7df] Fix VCS-field
- 
-  -- Wolfgang Fuetterer <debian at wlf-online.de>  Fri, 20 Feb 2015 12:57:50 +0100
- 
- calculix-ccx (2.7-1) unstable; urgency=medium
+ calculix-ccx (2.8p1-1~exp1) experimental; urgency=medium
  
    * Initial release (Closes: #767617)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/calculix-ccx.git