[berkeley-abc] 03/04: Refreshed patches and set new Standards Version

Ruben Undheim rubund-guest at moszumanska.debian.org
Thu Nov 3 23:27:14 UTC 2016


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository berkeley-abc.

commit d2da01d0a3fb43dff5c634c66395e9051ff200e7
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Thu Nov 3 23:14:13 2016 +0000

    Refreshed patches and set new Standards Version
---
 debian/control                                |  2 +-
 debian/patches/cflags_ldflags.patch           |  4 ++--
 debian/patches/remove_bzlib_convenience.patch | 14 +++++++-------
 debian/patches/remove_zlib_convenience.patch  | 18 +++++++++---------
 debian/patches/reproducibility.patch          | 12 ++++++------
 debian/patches/writepla.patch                 |  4 ++--
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index bd0ac66..d65ce9a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Ruben Undheim <ruben.undheim at gmail.com>
 Build-Depends: debhelper (>= 9), libreadline-dev, libbz2-dev,
                zlib1g-dev
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/berkeley-abc.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/berkeley-abc.git
 Homepage: http://www.eecs.berkeley.edu/~alanmi/abc/
diff --git a/debian/patches/cflags_ldflags.patch b/debian/patches/cflags_ldflags.patch
index ce0342c..823227d 100644
--- a/debian/patches/cflags_ldflags.patch
+++ b/debian/patches/cflags_ldflags.patch
@@ -4,8 +4,8 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: berkeley-abc/Makefile
 ===================================================================
---- berkeley-abc.orig/Makefile	2016-02-28 15:39:36.205555535 +0100
-+++ berkeley-abc/Makefile	2016-02-28 15:41:37.311771354 +0100
+--- berkeley-abc.orig/Makefile	2016-11-03 23:13:32.919307349 +0000
++++ berkeley-abc/Makefile	2016-11-03 23:13:32.915307349 +0000
 @@ -145,27 +145,27 @@
  
  %.o: %.c
diff --git a/debian/patches/remove_bzlib_convenience.patch b/debian/patches/remove_bzlib_convenience.patch
index dc29176..5a4c94a 100644
--- a/debian/patches/remove_bzlib_convenience.patch
+++ b/debian/patches/remove_bzlib_convenience.patch
@@ -5,8 +5,8 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: berkeley-abc/Makefile
 ===================================================================
---- berkeley-abc.orig/Makefile	2016-02-28 15:46:10.143100866 +0100
-+++ berkeley-abc/Makefile	2016-02-28 15:46:46.455214622 +0100
+--- berkeley-abc.orig/Makefile	2016-11-03 23:13:04.679307046 +0000
++++ berkeley-abc/Makefile	2016-11-03 23:13:04.675307046 +0000
 @@ -18,7 +18,7 @@
  	src/map/mapper src/map/mio src/map/super src/map/if \
  	src/map/amap src/map/cov src/map/scl src/map/mpm \
@@ -14,7 +14,7 @@ Index: berkeley-abc/Makefile
 -	src/misc/vec src/misc/hash src/misc/tim src/misc/bzlib src/misc/zlib \
 +	src/misc/vec src/misc/hash src/misc/tim src/misc/zlib \
  	src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
- 	src/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
+ 	src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
  	src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
 @@ -117,7 +117,7 @@
  endif
@@ -27,8 +27,8 @@ Index: berkeley-abc/Makefile
  endif
 Index: berkeley-abc/src/base/io/ioReadAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioReadAiger.c	2016-02-28 15:46:10.143100866 +0100
-+++ berkeley-abc/src/base/io/ioReadAiger.c	2016-02-28 15:46:10.135101704 +0100
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c	2016-11-03 23:13:04.679307046 +0000
++++ berkeley-abc/src/base/io/ioReadAiger.c	2016-11-03 23:13:04.679307046 +0000
 @@ -26,7 +26,7 @@
  #include <string.h>
  #include <assert.h>
@@ -40,8 +40,8 @@ Index: berkeley-abc/src/base/io/ioReadAiger.c
  
 Index: berkeley-abc/src/base/io/ioWriteAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioWriteAiger.c	2016-02-28 15:46:10.143100866 +0100
-+++ berkeley-abc/src/base/io/ioWriteAiger.c	2016-02-28 15:46:10.135101704 +0100
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c	2016-11-03 23:13:04.679307046 +0000
++++ berkeley-abc/src/base/io/ioWriteAiger.c	2016-11-03 23:13:04.679307046 +0000
 @@ -26,7 +26,7 @@
  #include <string.h>
  #include <assert.h>
diff --git a/debian/patches/remove_zlib_convenience.patch b/debian/patches/remove_zlib_convenience.patch
index 2c7b32e..2eea64d 100644
--- a/debian/patches/remove_zlib_convenience.patch
+++ b/debian/patches/remove_zlib_convenience.patch
@@ -5,8 +5,8 @@ Forwarded: doesn't make sense upstream
 Author: Ruben Undheim <ruben.undheim at gmail.com>
 Index: berkeley-abc/Makefile
 ===================================================================
---- berkeley-abc.orig/Makefile	2016-02-28 15:39:08.493543911 +0100
-+++ berkeley-abc/Makefile	2016-02-28 15:39:24.147311960 +0100
+--- berkeley-abc.orig/Makefile	2016-11-03 23:13:26.263307278 +0000
++++ berkeley-abc/Makefile	2016-11-03 23:13:26.259307278 +0000
 @@ -18,7 +18,7 @@
  	src/map/mapper src/map/mio src/map/super src/map/if \
  	src/map/amap src/map/cov src/map/scl src/map/mpm \
@@ -14,7 +14,7 @@ Index: berkeley-abc/Makefile
 -	src/misc/vec src/misc/hash src/misc/tim src/misc/zlib \
 +	src/misc/vec src/misc/hash src/misc/tim \
  	src/misc/mem src/misc/bar src/misc/bbl src/misc/parse \
- 	src/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
+ 	src/opt/cut src/opt/fxu src/opt/fxch src/opt/rwr src/opt/mfs src/opt/sim \
  	src/opt/ret src/opt/fret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
 @@ -117,7 +117,7 @@
  endif
@@ -27,8 +27,8 @@ Index: berkeley-abc/Makefile
  endif
 Index: berkeley-abc/src/base/io/ioReadAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioReadAiger.c	2016-02-28 15:39:08.493543911 +0100
-+++ berkeley-abc/src/base/io/ioReadAiger.c	2016-02-28 15:39:08.485545035 +0100
+--- berkeley-abc.orig/src/base/io/ioReadAiger.c	2016-11-03 23:13:26.263307278 +0000
++++ berkeley-abc/src/base/io/ioReadAiger.c	2016-11-03 23:13:26.259307278 +0000
 @@ -27,7 +27,7 @@
  #include <assert.h>
  
@@ -40,8 +40,8 @@ Index: berkeley-abc/src/base/io/ioReadAiger.c
  ABC_NAMESPACE_IMPL_START
 Index: berkeley-abc/src/base/io/ioWriteAiger.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioWriteAiger.c	2016-02-28 15:39:08.493543911 +0100
-+++ berkeley-abc/src/base/io/ioWriteAiger.c	2016-02-28 15:39:08.489544473 +0100
+--- berkeley-abc.orig/src/base/io/ioWriteAiger.c	2016-11-03 23:13:26.263307278 +0000
++++ berkeley-abc/src/base/io/ioWriteAiger.c	2016-11-03 23:13:26.263307278 +0000
 @@ -27,7 +27,7 @@
  #include <assert.h>
  
@@ -53,8 +53,8 @@ Index: berkeley-abc/src/base/io/ioWriteAiger.c
  
 Index: berkeley-abc/src/sat/cnf/cnfMan.c
 ===================================================================
---- berkeley-abc.orig/src/sat/cnf/cnfMan.c	2016-02-28 15:39:08.493543911 +0100
-+++ berkeley-abc/src/sat/cnf/cnfMan.c	2016-02-28 15:39:08.489544473 +0100
+--- berkeley-abc.orig/src/sat/cnf/cnfMan.c	2016-11-03 23:13:26.263307278 +0000
++++ berkeley-abc/src/sat/cnf/cnfMan.c	2016-11-03 23:13:26.263307278 +0000
 @@ -21,7 +21,7 @@
  #include "cnf.h"
  #include "sat/bsat/satSolver.h"
diff --git a/debian/patches/reproducibility.patch b/debian/patches/reproducibility.patch
index 2b86afd..3534b8c 100644
--- a/debian/patches/reproducibility.patch
+++ b/debian/patches/reproducibility.patch
@@ -3,9 +3,9 @@ Description: Remove the __TIME__ etc macros
 Author: Johann Klammer <klammerj at a1.net>
 Index: berkeley-abc/src/base/cmd/cmdUtils.c
 ===================================================================
---- berkeley-abc.orig/src/base/cmd/cmdUtils.c
-+++ berkeley-abc/src/base/cmd/cmdUtils.c
-@@ -589,7 +589,7 @@ void CmdCommandPrint( Abc_Frame_t * pAbc
+--- berkeley-abc.orig/src/base/cmd/cmdUtils.c	2016-11-03 23:13:41.607307443 +0000
++++ berkeley-abc/src/base/cmd/cmdUtils.c	2016-11-03 23:13:41.603307442 +0000
+@@ -589,7 +589,7 @@
      nColumns = 79 / (LenghtMax + 2);
  
      // print the starting message 
@@ -16,9 +16,9 @@ Index: berkeley-abc/src/base/cmd/cmdUtils.c
      sGroupCur = NULL;
 Index: berkeley-abc/src/base/main/mainUtils.c
 ===================================================================
---- berkeley-abc.orig/src/base/main/mainUtils.c
-+++ berkeley-abc/src/base/main/mainUtils.c
-@@ -52,7 +52,7 @@ static char * DateReadFromDateString( ch
+--- berkeley-abc.orig/src/base/main/mainUtils.c	2016-11-03 23:13:41.607307443 +0000
++++ berkeley-abc/src/base/main/mainUtils.c	2016-11-03 23:13:41.603307442 +0000
+@@ -52,7 +52,7 @@
  char * Abc_UtilsGetVersion( Abc_Frame_t * pAbc )
  {
      static char Version[1000];
diff --git a/debian/patches/writepla.patch b/debian/patches/writepla.patch
index aedfa09..e8adee6 100644
--- a/debian/patches/writepla.patch
+++ b/debian/patches/writepla.patch
@@ -4,8 +4,8 @@ Forwarded: https://bitbucket.org/alanmi/abc/issue/27/assertion-failure-in-write_
 Author: Johann Klammer <klammerj at a1.net>
 Index: berkeley-abc/src/base/io/ioWritePla.c
 ===================================================================
---- berkeley-abc.orig/src/base/io/ioWritePla.c	2016-02-28 15:42:47.295199324 +0100
-+++ berkeley-abc/src/base/io/ioWritePla.c	2016-02-28 15:42:47.291199471 +0100
+--- berkeley-abc.orig/src/base/io/ioWritePla.c	2016-11-03 23:13:46.431307494 +0000
++++ berkeley-abc/src/base/io/ioWritePla.c	2016-11-03 23:13:46.431307494 +0000
 @@ -174,7 +174,7 @@
      FILE * pFile;
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/berkeley-abc.git



More information about the debian-science-commits mailing list