[berkeley-abc] 01/01: Imported Debian patch 1.01+20140822hg4d547a5+dfsg-1

Ruben Undheim rubund-guest at moszumanska.debian.org
Wed Sep 17 16:22:00 UTC 2014


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 c94dc9383bf1c0e18f1061b0a7e9ba89d6e92426
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Sep 5 21:17:26 2014 +0200

    Imported Debian patch 1.01+20140822hg4d547a5+dfsg-1
---
 debian/README.source                          |   9 ++
 debian/berkeley-abc.1                         |  42 ++++++
 debian/berkeley-abc.install                   |   1 +
 debian/berkeley-abc.manpages                  |   1 +
 debian/changelog                              |   5 +
 debian/compat                                 |   1 +
 debian/control                                |  26 ++++
 debian/copyright                              | 207 ++++++++++++++++++++++++++
 debian/docs                                   |   0
 debian/patches/cflags_ldflags.patch           |  41 +++++
 debian/patches/remove_bzlib_convenience.patch |  53 +++++++
 debian/patches/remove_zlib_convenience.patch  |  66 ++++++++
 debian/patches/series                         |   3 +
 debian/rules                                  |  15 ++
 debian/source/format                          |   1 +
 15 files changed, 471 insertions(+)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..251b0f6
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+The source tar ball was repackaged since it contained pre-compiled binary
+libraries for Windows:
+
+ abc/lib/x64/pthreadVC2.dll | Bin 82944 -> 0 bytes
+ abc/lib/x64/pthreadVC2.lib | Bin 29738 -> 0 bytes
+ abc/lib/x86/pthreadVC2.dll | Bin 86070 -> 0 bytes
+ abc/lib/x86/pthreadVC2.lib | Bin 29280 -> 0 bytes
+
+These are the only files that have been removed in the +dfsg tar ball.
diff --git a/debian/berkeley-abc.1 b/debian/berkeley-abc.1
new file mode 100644
index 0000000..9fa0724
--- /dev/null
+++ b/debian/berkeley-abc.1
@@ -0,0 +1,42 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH BERKELEY-ABC 1 "September 14, 2014"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+berkeley-abc \-  A System for Sequential Synthesis and Verification 
+.SH SYNOPSIS
+.B berkeley-abc
+.RI [ options ] " <infile>"
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.B berkeley-abc
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBberkeley-abc\fP is a program that synthesizes RTL to gate-level logic.
+.SH OPTIONS
+A summary of options is included below.
+.\".TP
+.\".B \-q
+.\"quiet operation. only write error message to console
+.SH AUTHOR
+berkeley-abc was written by Berkeley Logic Synthesis and Verification Group.
+.PP
+This manual page was written by Ruben Undheim <ruben.undheim at gmail.com>,
+for the Debian project (and may be used by others).
diff --git a/debian/berkeley-abc.install b/debian/berkeley-abc.install
new file mode 100644
index 0000000..0315a88
--- /dev/null
+++ b/debian/berkeley-abc.install
@@ -0,0 +1 @@
+berkeley-abc usr/bin
diff --git a/debian/berkeley-abc.manpages b/debian/berkeley-abc.manpages
new file mode 100644
index 0000000..2d2e5b1
--- /dev/null
+++ b/debian/berkeley-abc.manpages
@@ -0,0 +1 @@
+debian/berkeley-abc.1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..e20e11d
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+berkeley-abc (1.01+20140822hg4d547a5+dfsg-1) unstable; urgency=low
+
+  * Initial release (Closes: #761364)
+
+ -- Ruben Undheim <ruben.undheim at gmail.com>  Fri, 05 Sep 2014 21:17:26 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..e43a0e0
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: berkeley-abc
+Section: electronics
+Priority: optional
+Maintainer: Ruben Undheim <ruben.undheim at gmail.com>
+Build-Depends: debhelper (>= 9), libreadline-dev, libbz2-dev,
+               zlib1g-dev
+Standards-Version: 3.9.5
+Vcs-Git: git://github.com/rubund/berkeley-abc.git
+Vcs-Browser: https://github.com/rubund/berkeley-abc/tree/master
+Homepage: http://www.eecs.berkeley.edu/~alanmi/abc/
+
+Package: berkeley-abc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: ABC - A System for Sequential Synthesis and Verification 
+ This is a growing software system for synthesis and verification of binary
+ sequential logic circuits appearing in synchronous hardware designs. ABC
+ combines scalable logic optimization based on And-Inverter Graphs (AIGs),
+ optimal-delay DAG-based technology mapping for look-up tables and standard
+ cells, and innovative algorithms for sequential synthesis and verification.
+ .
+ ABC provides an experimental implementation of these algorithms and a
+ programming environment for building similar applications. Future development
+ will focus on improving the algorithms and making most of the packages
+ stand-alone. This will allow the user to customize ABC for their needs as if
+ it were a tool-box rather than a complete tool.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..a2d30eb
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,207 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ABC
+Source: http://www.eecs.berkeley.edu/~alanmi/abc/
+
+Files: *
+Copyright: The Regents of the University of California
+License: University-of-California-Berkeley
+
+Files: src/bdd/cudd/* src/bdd/mtr/* src/bdd/epd/*
+Copyright: 1995-2004 Regents of the University of Colorado
+License: University-of-Colorado 
+
+Files: lib/pthread.h lib/sched.h lib/semaphore.h
+Copyright: 1998 John E. Bossom
+           1999,2005 Pthreads-win32 contributors
+License: GPL-2+ 
+
+Files: src/sat/lsat/solver.h
+Copyright: 2008 Niklas Sorensson
+           2008 Koen Claessen
+License: MIT
+
+Files: src/sat/bsat/*
+Copyright: 2005 Niklas Sorensson
+License: MIT
+
+Files: src/misc/bzlib/*
+Copyright: 1996-2007 Julian Seward <jseward at bzip.org>
+License: BSD-4
+
+Files: src/misc/zlib/*
+Copyright: 1995-2010 Mark Adler
+           1995-2010 Jean-loup Gailly
+License: zlib-license
+
+Files: src/base/abci/abcSaucy.c
+Copyright: 2004 The Regents of the University of Michigan
+License: University-of-Michigan
+
+Files: debian/*
+Copyright: 2014 Ruben Undheim <ruben.undheim at gmail.com>
+License: GPL-2+
+
+
+
+
+
+License: University-of-California-Berkeley
+ Permission is hereby granted, without written agreement and without license or
+ royalty fees, to use, copy, modify, and distribute this software and its
+ documentation for any purpose, provided that the above copyright notice and
+ the following two paragraphs appear in all copies of this software.
+ .
+ IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
+ DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+ THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
+ CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+ AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
+ SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: University-of-Colorado 
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ Neither the name of the University of Colorado nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.]
+
+License: zlib-license
+ This software is provided 'as-is', without any express or implied
+ warranty.  In no event will the authors be held liable for any damages
+ arising from the use of this software.
+ .
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+ .
+ 1. The origin of this software must not be misrepresented; you must not
+    claim that you wrote the original software. If you use this software
+    in a product, an acknowledgment in the product documentation would be
+    appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+    misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+License: University-of-Michigan
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ Neither the name of the University of Michigan nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.]
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: BSD-4
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ .
+ 2. The origin of this software must not be misrepresented; you must 
+    not claim that you wrote the original software.  If you use this 
+    software in a product, an acknowledgment in the product 
+    documentation would be appreciated but is not required.
+ .
+ 3. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+ .
+ 4. The name of the author may not be used to endorse or promote 
+    products derived from this software without specific prior written 
+    permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY 
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
+
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..e69de29
diff --git a/debian/patches/cflags_ldflags.patch b/debian/patches/cflags_ldflags.patch
new file mode 100644
index 0000000..6145051
--- /dev/null
+++ b/debian/patches/cflags_ldflags.patch
@@ -0,0 +1,41 @@
+Description: Using LDFLAGS and CPPFLAGSpassed down from
+  dpkg-buildflags such that hardening gets enabled.
+Forwarded: doesn't make sense upstream
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+Index: berkeley-abc-1.01-20140822hg4d547a5e065b/Makefile
+===================================================================
+--- berkeley-abc-1.01-20140822hg4d547a5e065b.orig/Makefile	2014-09-14 12:16:38.850652511 +0200
++++ berkeley-abc-1.01-20140822hg4d547a5e065b/Makefile	2014-09-14 12:19:23.174654274 +0200
+@@ -103,19 +103,19 @@
+ 
+ %.o: %.c
+ 	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
+-	@$(CC) -c $(CFLAGS) $< -o $@
++	@$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+ 
+ %.o: %.cc
+ 	@echo "$(MSG_PREFIX)\`\` Compiling:" $(LOCAL_PATH)/$<
+-	@$(CXX) -c $(CXXFLAGS) $< -o $@
++	@$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+ 
+ %.d: %.c
+ 	@echo "$(MSG_PREFIX)\`\` Dependency:" $(LOCAL_PATH)/$<
+-	@./depends.sh $(CC) `dirname $*.c` $(CFLAGS) $*.c > $@
++	@./depends.sh $(CC) `dirname $*.c` $(CPPFLAGS) $(CFLAGS) $*.c > $@
+ 
+ %.d: %.cc
+ 	@echo "$(MSG_PREFIX)\`\` Generating dependency:" $(LOCAL_PATH)/$<
+-	@./depends.sh $(CXX) `dirname $*.cc` $(CXXFLAGS) $*.cc > $@
++	@./depends.sh $(CXX) `dirname $*.cc` $(CPPFLAGS) $(CXXFLAGS) $*.cc > $@
+ 
+ -include $(DEP)
+ 
+@@ -132,7 +132,7 @@
+ 
+ $(PROG): $(OBJ)
+ 	@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
+-	@$(LD) -o $@ $^ $(LIBS)
++	@$(LD) -o $@ $^ $(LIBS) $(LDFLAGS)
+ 
+ lib$(PROG).a: $(OBJ)
+ 	@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
diff --git a/debian/patches/remove_bzlib_convenience.patch b/debian/patches/remove_bzlib_convenience.patch
new file mode 100644
index 0000000..8a435ed
--- /dev/null
+++ b/debian/patches/remove_bzlib_convenience.patch
@@ -0,0 +1,53 @@
+Description: The library bzlib is included in the source and
+  built as a convenience library. This patch prevents this from being
+  built and links berkeley-abc with debian's bzlib library instead.
+Forwarded: doesn't make sense upstream
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+Index: yosys-abc/Makefile
+===================================================================
+--- yosys-abc.orig/Makefile
++++ yosys-abc/Makefile
+@@ -20,7 +20,7 @@ MODULES := \
+ 	src/map/mapper src/map/mio src/map/super src/map/if \
+ 	src/map/amap src/map/cov src/map/scl src/map/mpm \
+ 	src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
+-	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/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
+ 	src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
+@@ -67,7 +67,7 @@ endif
+ endif
+ 
+ # LIBS := -ldl -lrt
+-LIBS := -ldl
++LIBS := -ldl -lbz2
+ ifneq ($(findstring Darwin, $(shell uname)), Darwin)
+    LIBS += -lrt
+ endif
+Index: yosys-abc/src/base/io/ioReadAiger.c
+===================================================================
+--- yosys-abc.orig/src/base/io/ioReadAiger.c
++++ yosys-abc/src/base/io/ioReadAiger.c
+@@ -26,7 +26,7 @@
+ #include <string.h>
+ #include <assert.h>
+ 
+-#include "misc/bzlib/bzlib.h"
++#include <bzlib.h>
+ #include "misc/zlib/zlib.h"
+ #include "ioAbc.h"
+ 
+Index: yosys-abc/src/base/io/ioWriteAiger.c
+===================================================================
+--- yosys-abc.orig/src/base/io/ioWriteAiger.c
++++ yosys-abc/src/base/io/ioWriteAiger.c
+@@ -26,7 +26,7 @@
+ #include <string.h>
+ #include <assert.h>
+ 
+-#include "misc/bzlib/bzlib.h"
++#include <bzlib.h>
+ #include "misc/zlib/zlib.h"
+ #include "ioAbc.h"
+ 
diff --git a/debian/patches/remove_zlib_convenience.patch b/debian/patches/remove_zlib_convenience.patch
new file mode 100644
index 0000000..7360637
--- /dev/null
+++ b/debian/patches/remove_zlib_convenience.patch
@@ -0,0 +1,66 @@
+Description: The library zlib is included in the source and
+  built as a convenience library. This patch prevents this from being
+  built and links berkeley-abc with debian's zlib library instead.
+Forwarded: doesn't make sense upstream
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+Index: abc/Makefile
+===================================================================
+--- abc.orig/Makefile
++++ abc/Makefile
+@@ -20,7 +20,7 @@ MODULES := \
+ 	src/map/mapper src/map/mio src/map/super src/map/if \
+ 	src/map/amap src/map/cov src/map/scl src/map/mpm \
+ 	src/misc/extra src/misc/mvc src/misc/st src/misc/util src/misc/nm \
+-	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/opt/cut src/opt/fxu src/opt/rwr src/opt/mfs src/opt/sim \
+ 	src/opt/ret src/opt/res src/opt/lpk src/opt/nwk src/opt/rwt \
+@@ -67,7 +67,7 @@ endif
+ endif
+ 
+ # LIBS := -ldl -lrt
+-LIBS := -ldl -lbz2
++LIBS := -ldl -lbz2 -lz
+ ifneq ($(findstring Darwin, $(shell uname)), Darwin)
+    LIBS += -lrt
+ endif
+Index: abc/src/base/io/ioReadAiger.c
+===================================================================
+--- abc.orig/src/base/io/ioReadAiger.c
++++ abc/src/base/io/ioReadAiger.c
+@@ -27,7 +27,7 @@
+ #include <assert.h>
+ 
+ #include <bzlib.h>
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+ #include "ioAbc.h"
+ 
+ ABC_NAMESPACE_IMPL_START
+Index: abc/src/base/io/ioWriteAiger.c
+===================================================================
+--- abc.orig/src/base/io/ioWriteAiger.c
++++ abc/src/base/io/ioWriteAiger.c
+@@ -27,7 +27,7 @@
+ #include <assert.h>
+ 
+ #include <bzlib.h>
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+ #include "ioAbc.h"
+ 
+ 
+Index: abc/src/sat/cnf/cnfMan.c
+===================================================================
+--- abc.orig/src/sat/cnf/cnfMan.c
++++ abc/src/sat/cnf/cnfMan.c
+@@ -21,7 +21,7 @@
+ #include "cnf.h"
+ #include "sat/bsat/satSolver.h"
+ #include "sat/bsat/satSolver2.h"
+-#include "misc/zlib/zlib.h"
++#include <zlib.h>
+ 
+ ABC_NAMESPACE_IMPL_START
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..94981b3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+remove_bzlib_convenience.patch
+remove_zlib_convenience.patch
+cflags_ldflags.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..1d5c8c1
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+%:
+	dh $@ 
+
+
+override_dh_auto_build:
+	make PROG="abc" MSG_PREFIX="ABC: "
+	cp abc berkeley-abc
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
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