[SCM] Packaging for mmdb branch, master, updated. debian/1.23.2.1-0ubuntu1-21-g92f5b6e

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Tue Jan 1 16:00:11 UTC 2013


The following commit has been merged in the master branch:
commit 831ba415a079bbda56991b3d93e270fe74d0a9a5
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Dec 23 17:18:48 2012 +0100

    remove useless patch

diff --git a/debian/patches/0001-mmdb_mmcif.cpp.patch b/debian/patches/0001-mmdb_mmcif.cpp.patch
deleted file mode 100644
index f1d2bc4..0000000
--- a/debian/patches/0001-mmdb_mmcif.cpp.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From: Morten Kjeldgaard <mok0 at ubuntu.com>
-Date: Sun, 1 Jul 2012 18:31:22 +0200
-Subject: mmdb_mmcif.cpp
-
-=== modified file 'src/mmdb_mmcif.cpp'
----
- src/mmdb_mmcif.cpp |   15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/mmdb_mmcif.cpp b/src/mmdb_mmcif.cpp
-index 39bca89..fb82aae 100644
---- a/src/mmdb_mmcif.cpp
-+++ b/src/mmdb_mmcif.cpp
-@@ -1753,7 +1753,7 @@ pstr L;
-     p = &(S[0]);
-     while ((*p==' ') || (*p==char(9)))  p++;
-     if (strncmp(p,"data_",5))  {
--      f.ReadLine ( S );
-+      f.ReadLine ( S, 10000 );
-       lcount++;
-       p = NULL;
-     }
-@@ -1766,7 +1766,7 @@ pstr L;
-     return CIFRC_NoDataLine;
-   }
- 
--  llen = 500;
-+  llen = 11000;
-   L    = new char[llen];
-   i    = 0;
-   p   += 5;
-@@ -1813,7 +1813,7 @@ pstr L;
- 
-     if (!(*p))  {
-       if (!f.FileEnd())  {
--        f.ReadLine ( S );
-+        f.ReadLine ( S, 10000 );
-         lcount++;
-         p = &(S[0]);
-       } else
-@@ -1823,6 +1823,7 @@ pstr L;
-   }
- 
-   if (L)  delete[] L;
-+  L = 0;
- 
-   Optimize();  // get rid of over-allocated fields.
- 
-@@ -2046,7 +2047,7 @@ int         RC,i,nC;
-     } else if (!(*p) || (*p=='#'))  {
-       Repeat = !f.FileEnd();
-       if (Repeat)  {
--        f.ReadLine ( S );
-+        f.ReadLine ( S, 10000 );
-         lcount++;
-         p = &(S[0]);
-       } else  {
-@@ -2067,7 +2068,7 @@ int         RC,i,nC;
-       if (!(*p) || (*p=='#'))  {
-         Repeat = !f.FileEnd();
-         if (Repeat)  {
--          f.ReadLine ( S );
-+          f.ReadLine ( S, 10000 );
-           lcount++;
-           p = &(S[0]);
-         }
-@@ -2118,7 +2119,7 @@ char    c;
-       Repeat = !f.FileEnd();
-       if (Repeat)  {
-         // take the next line
--        f.ReadLine ( S );
-+        f.ReadLine ( S, 10000 );
-         lcount++;
-         p = &(S[0]);
-         Repeat = (*p!=';');
-@@ -2139,7 +2140,7 @@ char    c;
-     strcpy ( L,p );    // take first line of the field
-     flen = strlen(L);
-     while (!f.FileEnd())  {
--      f.ReadLine ( S );
-+      f.ReadLine ( S, 10000 );
-       lcount++;
-       p = &(S[0]);
-       if (*p==';')  {  // multiline field terminated
diff --git a/debian/patches/series b/debian/patches/series
index a640e31..2f18a1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-mmdb_mmcif.cpp.patch
 0002-forwarded-upstream-mmdb.pc-autotools-integration.patch

-- 
Packaging for mmdb



More information about the debian-science-commits mailing list