[getfem] 01/01: Merge

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository getfem.

commit a169911572d18629c29b9d8a85da1023e830344e
Merge: b07e8cd 81baf53
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Aug 25 06:31:22 2015 +0200

    Merge

 debian/changelog | 13 ++++++-------
 debian/control   |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 680a832,48ba91e..2a66544
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,9 +1,19 @@@
 +getfem++ (4.3+dfsg-1) experimental; urgency=medium
 +
-   * Team upload
- 
-   [ Anton Gladky ]
 +  * [db7d741] Update get_orig script.
 +  * [5cd3bde] Imported Upstream version 4.3+dfsg.orig
 +  * [523f38b] Refresh patches.
 +  * [30aaf17] Ignore quilt dir
 +  * [908406a] Update changelog.
 +
++ -- Anton Gladky <gladk at debian.org>  Tue, 25 Aug 2015 06:30:31 +0200
++
+ getfem++ (4.2.1~beta1~svn4635~dfsg-4) unstable; urgency=medium
+ 
    [ Scott Howard ]
-   * [10f0f14] Replace python-support with dh-python2 (Closes: #786080)
-   * [9e563f8] Rename package for GCC 5 transition,
-     rebuild for GCC 5 transition (Closes: #793243)
+   * [8d1a31c] Rename package for GCC 5 transition. (Closes: #793243)
  
-  -- Scott Howard <showard at debian.org>  Sun, 23 Aug 2015 15:01:32 -0400
+  -- Anton Gladky <gladk at debian.org>  Sun, 23 Aug 2015 22:27:04 +0200
  
  getfem++ (4.2.1~beta1~svn4635~dfsg-3) unstable; urgency=medium
  

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