[med-fichier] 14/17: Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages//med-fichier into new_master
Christophe Trophime
trophime-guest at moszumanska.debian.org
Tue Jan 28 10:40:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
trophime-guest pushed a commit to branch master
in repository med-fichier.
commit 72a9cc9108d74625309ed7dcf83cbb07af282c15
Merge: 3208972 9066354
Author: Christophe Trophime <christrophime at googlemail.com>
Date: Mon Oct 28 08:42:01 2013 +0100
Merge branch 'master' of git+ssh://git.debian.org/git/debian-science/packages//med-fichier into new_master
Conflicts:
debian/changelog
debian/control
debian/patches/00-am_maintainer_mode.patch
debian/patches/01-ac-prog-fc.patch
debian/patches/04-debian-mpi-libs.patch
debian/patches/series
debian/rules
debian/README.source | 57 -
debian/changelog | 49 +-
debian/compat | 2 +-
debian/control | 192 +-
debian/copyright | 13 +-
debian/libmed-dev.install | 6 +-
debian/libmed1.install | 2 +-
debian/libmedc-dev.install | 26 +-
debian/libmedc1.install | 2 +-
debian/libmedimport-dev.install | 6 +-
debian/libmedimport0.install | 2 +-
debian/patches/00-am_maintainer_mode.patch | 14 -
debian/patches/01-ac-prog-fc.patch | 28 -
debian/patches/02-acinclude.patch | 13 -
debian/patches/03-c++-safe.patch | 25 -
debian/patches/04-debian-mpi-libs.patch | 24 -
debian/patches/05-xmdump-path-fix.patch | 13 -
debian/patches/99-autoreconf.patch | 3355 ----------------------------
debian/patches/series | 8 -
debian/rules | 169 +-
20 files changed, 205 insertions(+), 3801 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/med-fichier.git
More information about the debian-science-commits
mailing list