[SCM] Packaging of clipper branch, master, updated. debian/2.1+20100511-0ubuntu1-18-ga3b68ae

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Wed Jan 2 09:45:46 UTC 2013


The following commit has been merged in the master branch:
commit d1711877045517b4c147e4fa08190d273d220646
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Tue Jan 1 21:57:23 2013 +0100

    remove the patch series

diff --git a/debian/patches/0001-ccp4_makefile.am.patch b/debian/patches/0001-ccp4_makefile.am.patch
deleted file mode 100644
index a03a578..0000000
--- a/debian/patches/0001-ccp4_makefile.am.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Debian Science Maintainers
- <debian-science-maintainers at lists.alioth.debian.org>
-Date: Wed, 25 Jul 2012 21:36:45 +0200
-Subject: ccp4_makefile.am
-
----
- clipper/ccp4/Makefile.am |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/clipper/ccp4/Makefile.am b/clipper/ccp4/Makefile.am
-index ebdb38e..23b3932 100644
---- a/clipper/ccp4/Makefile.am
-+++ b/clipper/ccp4/Makefile.am
-@@ -2,8 +2,8 @@
- # in dir /home/cowtan/clipper-autoconf/clipper-2.1/clipper/ccp4
- ## -*- mode: Makefile; mode: font-lock -*-
- 
--
--INCLUDES=${FFTW_CXXFLAGS}
-+AM_CPPFLAGS = $(FFTW_CXXFLAGS) $(CCP4_CXXFLAGS)
-+AM_LDFLAGS = $(FFTW_LIBS) $(CCP4_LIBS)
- 
- library_include_HEADERS = \
-    ccp4_map_io.h  \
diff --git a/debian/patches/0002-mmdb_makefile.am.patch b/debian/patches/0002-mmdb_makefile.am.patch
deleted file mode 100644
index dc69615..0000000
--- a/debian/patches/0002-mmdb_makefile.am.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian Science Maintainers
- <debian-science-maintainers at lists.alioth.debian.org>
-Date: Wed, 25 Jul 2012 21:36:45 +0200
-Subject: mmdb_makefile.am
-
----
- examples/Makefile.am |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index 203ce96..6470c4d 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -38,6 +38,7 @@ LDADD = \
-       $(top_builddir)/clipper/cns/libclipper-cns.la \
-       $(top_builddir)/clipper/cif/libclipper-cif.la \
-       $(top_builddir)/clipper/minimol/libclipper-minimol.la \
-+      $(top_builddir)/clipper/mmdb/libclipper-mmdb.la \
-       $(top_builddir)/clipper/core/libclipper-core.la \
-       -lpthread
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index c9cb3fa..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-ccp4_makefile.am.patch
-0002-mmdb_makefile.am.patch

-- 
Packaging of clipper



More information about the debian-science-commits mailing list