[geant321] 01/06: Merge branch 'wheezy' into debian
Lifeng Sun
lifengsun-guest at alioth.debian.org
Sun Aug 25 05:55:59 UTC 2013
This is an automated email from the git hooks/post-receive script.
lifengsun-guest pushed a commit to branch debian
in repository geant321.
commit 9c01d4acb62c12f8752f4c005e4fa05aa4585ff1
Merge: 8114702 1b4c0be
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Mon Mar 25 22:52:20 2013 +0800
Merge branch 'wheezy' into debian
Conflicts:
debian/changelog
debian/dh/libgeant321-2-gfortran.install
debian/changelog | 17 +++++++++++++----
debian/rules | 3 +++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --cc debian/changelog
index b3d7405,74f3bfc..c9e6569
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,21 @@@
- geant321 (1:3.21.14.dfsg-10) unstable; urgency=low
++geant321 (1:3.21.14.dfsg-11~exp1) experimental; urgency=low
+
+ * debian/control: remove obsolete dpatch package from build-dep.
+ * Set source format to 3.0 (quilt).
- * Rename debian/debhelper to debian/dh to fix an issue similar to
- #640572.
+ * Support multiarch.
+
- -- Lifeng Sun <lifongsun at gmail.com> Thu, 05 Jul 2012 23:24:08 +0800
++ -- Lifeng Sun <lifongsun at gmail.com> Mon, 25 Mar 2013 22:46:28 +0800
++
+ geant321 (1:3.21.14.dfsg-10) unstable; urgency=low
+
+ * Team upload.
+ * [ff4aa0d] Build the package in non-parallel mode to escape FTBFS
+ due to race conditions.
+ * [aad8032] Rename debian/debhelper to debian/dh to prevent empty packages.
+ Thanks to Jason Conti <jason.conti at gmail.com>. (Closes: #695066)
+ * [2c3ddc4] Override lintian-error, dpatch is needed for building.
+
+ -- Anton Gladky <gladky.anton at gmail.com> Sun, 09 Dec 2012 00:21:56 +0100
geant321 (1:3.21.14.dfsg-9) unstable; urgency=low
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/geant321.git
More information about the debian-science-commits
mailing list