[libccp4] 03/03: release and remove all patches (applyed by upstream)
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Fri Jul 25 17:22:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository libccp4.
commit 0dd4d2fc2f769c51bbc0c18596e11f5cd7de28f6
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Fri Jul 25 18:46:41 2014 +0200
release and remove all patches (applyed by upstream)
---
debian/changelog | 9 ++++
debian/control | 4 +-
.../0001-fix-FTBFS-on-kfreebsd-and-hurd.patch | 36 -------------
debian/patches/0002-fix-FTBFS-for-powerpc.patch | 59 ----------------------
debian/patches/series | 2 -
5 files changed, 11 insertions(+), 99 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 227c87e..1eab411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libccp4 (6.4.5-1) unstable; urgency=medium
+
+ * Imported Upstream version 6.4.5
+ * debian/patches
+ - 0001-fix-FTBFS-on-kfreebsd-and-hurd.patch (applyed by upstream)
+ - 0002-fix-FTBFS-for-powerpc.patch (applyed by upstream)
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org> Fri, 25 Jul 2014 14:05:11 +0200
+
libccp4 (6.4.0~rc1-1~experimental3) experimental; urgency=low
* debian/patches
diff --git a/debian/control b/debian/control
index 5673097..580ad2c 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9),
gfortran,
libmmdb-dev,
m4
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Vcs-Browser: http://anonscm.debian.org/?p=debian-science/packages/libccp4.git;a=summary
Vcs-Git: git://anonscm.debian.org/debian-science/packages/libccp4.git
Homepage: http://www.ccp4.ac.uk/
@@ -65,7 +65,7 @@ Depends: ${misc:Depends},
libccp4c0 (= ${binary:Version}),
libccp4f0 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
-Description: CCP4 core functionality - developement files
+Description: CCP4 core functionality - development files
The CCP4 software suite is based around a library of routines which
cover common tasks, such as file opening, parsing keyworded input,
reading and writing of standard data formats, applying symmetry
diff --git a/debian/patches/0001-fix-FTBFS-on-kfreebsd-and-hurd.patch b/debian/patches/0001-fix-FTBFS-on-kfreebsd-and-hurd.patch
deleted file mode 100644
index e0280b3..0000000
--- a/debian/patches/0001-fix-FTBFS-on-kfreebsd-and-hurd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sat, 14 Sep 2013 12:11:26 +0200
-Subject: fix FTBFS on kfreebsd and hurd
-
----
- ccp4/ccp4_sysdep.h | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/ccp4/ccp4_sysdep.h b/ccp4/ccp4_sysdep.h
-index 3b59591..3ef1751 100644
---- a/ccp4/ccp4_sysdep.h
-+++ b/ccp4/ccp4_sysdep.h
-@@ -98,7 +98,13 @@
- # define CALL_LIKE_SUN 1
- #endif
-
--#if defined (__FreeBSD__)
-+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
-+# undef CALL_LIKE_SUN
-+# define KNOWN_MACHINE
-+# define CALL_LIKE_SUN 1
-+#endif
-+
-+#if defined (__gnu_hurd__)
- # undef CALL_LIKE_SUN
- # define KNOWN_MACHINE
- # define CALL_LIKE_SUN 1
-@@ -248,7 +254,7 @@
- # define NATIVEIT DFNTI_IBO
- #endif
-
--#if defined(MIPSEL) || defined(i386) || defined(i860) || defined(__ia64__) || defined(__amd64__) || defined(__x86_64__) || defined(WIN32)
-+#if defined(MIPSEL) || defined(i386) || defined(i860) || defined(__ia64__) || defined(__amd64__) || defined(__x86_64__) || defined(WIN32) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
- # define NATIVEIT DFNTI_IBO
- # define NATIVEFT DFNTF_LEIEEE
- #endif
diff --git a/debian/patches/0002-fix-FTBFS-for-powerpc.patch b/debian/patches/0002-fix-FTBFS-for-powerpc.patch
deleted file mode 100644
index 589d6d8..0000000
--- a/debian/patches/0002-fix-FTBFS-for-powerpc.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Sun, 15 Sep 2013 08:43:47 +0200
-Subject: fix FTBFS for powerpc
-
----
- fortran/library_f.c | 33 ++++-----------------------------
- 1 file changed, 4 insertions(+), 29 deletions(-)
-
-diff --git a/fortran/library_f.c b/fortran/library_f.c
-index b9e96ce..0041616 100644
---- a/fortran/library_f.c
-+++ b/fortran/library_f.c
-@@ -700,32 +700,9 @@ int ierrno () {
-
- #endif /* HPUX and AIX support */
-
--#if ( defined (__APPLE__) && !defined (__GNUC__) )
--/* apple xlf support */
--void gerror_ (str, Lstr)
--char *str;
--int Lstr;
--{
-- int i;
--
-- if (errno == 0) { /* Avoid `Error 0' or some such message */
-- for (i=1; Lstr; i++)
-- str[i] = ' ';
-- } else {
-- (void) strncpy (str, strerror (errno), Lstr);
-- for (i = strlen (str); i < Lstr; i++) str[i] = ' '; /* pad with spaces */
-- }
--} /* End of gerror (str, Lstr) */
--
--int isatty_(int *iunit)
--{
-- return isatty(*iunit);
--}
--
--#endif /* end of apple xlf support */
--
--#if ( defined (__linux__) && defined (_CALL_SYSV) )
--/* linuxppc xlf support */
-+#if !( defined(G95) || defined(GFORTRAN) || defined(F2C) ) && \
-+ ( ( defined(__linux__) && defined(_CALL_SYSV) ) || defined(__APPLE__) )
-+/* linuxppc xlf and apple xlf support */
- void gerror_ (str, Lstr)
- char *str;
- int Lstr;
-@@ -745,9 +722,7 @@ int isatty_(int *iunit)
- {
- return isatty(*iunit);
- }
--
--#endif /* end of linuxppc xlf support */
--
-+#endif /* end of linuxppc/apple xlf support */
-
- #if defined (sun)
- int isatty_(int *iunit)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0115985..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-fix-FTBFS-on-kfreebsd-and-hurd.patch
-0002-fix-FTBFS-for-powerpc.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libccp4.git
More information about the debian-science-commits
mailing list