[SCM] LAMMPS Molecular Dynamics Simulator branch, master, updated. debian/0_20120426.git67de404-1-4-g8f17d92

[Anton Gladky]

The following commit has been merged in the master branch:
commit 864de636e94ab8373c4e079c946e957f4105a715
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Jun 18 20:34:39 2012 +0200

    Remove patch, applied by upstream.

diff --git a/debian/patches/fix_format_not_a_string.patch b/debian/patches/fix_format_not_a_string.patch
deleted file mode 100644
index ac84332..0000000
--- a/debian/patches/fix_format_not_a_string.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Fix FTBFS "format not a string literal and no format arg"
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2012-02-23
-
---- a/src/fix_print.cpp
-+++ b/src/fix_print.cpp
-@@ -134,10 +134,10 @@
-   modify->addstep_compute(update->ntimestep + nevery);
- 
-   if (me == 0) {
--    if (screenflag && screen) fprintf(screen,copy);
--    if (screenflag && logfile) fprintf(logfile,copy);
-+    if (screenflag && screen) fprintf(screen,"%s",copy);
-+    if (screenflag && logfile) fprintf(logfile,"%s",copy);
-     if (fp) {
--      fprintf(fp,copy);
-+      fprintf(fp,"%s",copy);
-       fflush(fp);
-     }
-   }
---- a/src/thermo.cpp
-+++ b/src/thermo.cpp
-@@ -273,8 +273,8 @@
-   sprintf(&line[loc],"\n");
-   
-   if (me == 0) {
--    if (screen) fprintf(screen,line);
--    if (logfile) fprintf(logfile,line);
-+    if (screen) fprintf(screen,"%s",line);
-+    if (logfile) fprintf(logfile,"%s",line);
-   }
- }
- 
-@@ -343,9 +343,9 @@
-   // print line to screen and logfile
- 
-   if (me == 0) {
--    if (screen) fprintf(screen,line);
-+    if (screen) fprintf(screen,"%s",line);
-     if (logfile) {
--      fprintf(logfile,line);
-+      fprintf(logfile,"%s",line);
-       if (flushflag) fflush(logfile);
-     }
-   }
diff --git a/debian/patches/series b/debian/patches/series
index 8acf0f0..6b2ad29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 set_configure_flags.patch
-fix_format_not_a_string.patch

-- 
LAMMPS Molecular Dynamics Simulator