diff options
author | Felipe Barbosa Alves <barbosa.felipe10@gmail.com> | 2017-09-04 14:26:33 -0300 |
---|---|---|
committer | Ruben Undheim <ruben.undheim@gmail.com> | 2018-09-02 23:23:57 +0200 |
commit | bea3741c74766089d0d75e1ccff56d835ae2511f (patch) | |
tree | ce164ecf6150691305269eeadcd04db553d3c1d8 /debian | |
parent | f755f8b97dcbe99f794bbd0d946e41b98b1b23a3 (diff) |
Import Debian changes 9.7.93-2
irsim (9.7.93-2) unstable; urgency=medium
* QA upload.
* Set Debian QA Group as maintainer. (see #812628)
* Migrated DH level to 10.
* debian/control:
- Bumped Standards-Version to 4.0.0.
* debian/watch: updated version to 4.
* Run wrap-and-sort -a.
irsim (9.7.93-1) unstable; urgency=medium
* New upstream release
* debian/control: Standards-Version: 3.9.6
* Added 05-reproducible-build.patch to make build reproducible. Thanks to
Chris Lamb (Closes: #778267)
irsim (9.7.87-1) unstable; urgency=medium
* New upstream release
irsim (9.7.84-1) unstable; urgency=medium
* New upstream release
* debian/control: Standards-Version: 3.9.5
irsim (9.7.82-2) unstable; urgency=low
* Use autotools-dev to update config.{sub,guess} (Closes: #727389)
irsim (9.7.82-1) unstable; urgency=low
* New upstream release
* Use readlink for /usr/bin/wish in irsim to use versioned wish
(Closes: #725700)
irsim (9.7.79-2) unstable; urgency=low
* debian/control: Standards-Version: 3.9.4
irsim (9.7.79-1) experimental; urgency=low
* New upstream release
irsim (9.7.78-1) experimental; urgency=low
* New upstream release
irsim (9.7.75-1) unstable; urgency=low
* New upstream release
* debian/compat: 9
* debian/control: Standards-Version: 3.9.3
irsim (9.7.74-1) unstable; urgency=low
* Initial release (Closes: #478112)
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 79 | ||||
-rw-r--r-- | debian/clean | 1 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 25 | ||||
-rw-r--r-- | debian/copyright | 34 | ||||
-rw-r--r-- | debian/docs | 1 | ||||
-rw-r--r-- | debian/menu | 2 | ||||
-rw-r--r-- | debian/patches/01-makefile.patch | 88 | ||||
-rw-r--r-- | debian/patches/02-manpages.patch | 33 | ||||
-rw-r--r-- | debian/patches/03-fhs-images.patch | 43 | ||||
-rw-r--r-- | debian/patches/04-makefile-fix-hardening-ldflags.patch | 72 | ||||
-rw-r--r-- | debian/patches/05-reproducible-build.patch | 11 | ||||
-rw-r--r-- | debian/patches/series | 5 | ||||
-rwxr-xr-x | debian/rules | 11 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 2 |
16 files changed, 409 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..d4770f5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,79 @@ +irsim (9.7.93-2) unstable; urgency=medium + + * QA upload. + * Set Debian QA Group as maintainer. (see #812628) + * Migrated DH level to 10. + * debian/control: + - Bumped Standards-Version to 4.0.0. + * debian/watch: updated version to 4. + * Run wrap-and-sort -a. + + -- Felipe Barbosa Alves <barbosa.felipe10@gmail.com> Mon, 04 Sep 2017 14:26:33 -0300 + +irsim (9.7.93-1) unstable; urgency=medium + + * New upstream release + * debian/control: Standards-Version: 3.9.6 + * Added 05-reproducible-build.patch to make build reproducible. Thanks to + Chris Lamb (Closes: #778267) + + -- Roland Stigge <stigge@antcom.de> Sat, 16 Jan 2016 16:39:46 +0100 + +irsim (9.7.87-1) unstable; urgency=medium + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Sat, 07 Jun 2014 16:13:37 +0200 + +irsim (9.7.84-1) unstable; urgency=medium + + * New upstream release + * debian/control: Standards-Version: 3.9.5 + + -- Roland Stigge <stigge@antcom.de> Thu, 29 May 2014 17:42:57 +0200 + +irsim (9.7.82-2) unstable; urgency=low + + * Use autotools-dev to update config.{sub,guess} (Closes: #727389) + + -- Roland Stigge <stigge@antcom.de> Thu, 24 Oct 2013 11:30:39 +0200 + +irsim (9.7.82-1) unstable; urgency=low + + * New upstream release + * Use readlink for /usr/bin/wish in irsim to use versioned wish + (Closes: #725700) + + -- Roland Stigge <stigge@antcom.de> Thu, 17 Oct 2013 10:35:16 +0200 + +irsim (9.7.79-2) unstable; urgency=low + + * debian/control: Standards-Version: 3.9.4 + + -- Roland Stigge <stigge@antcom.de> Wed, 15 May 2013 21:50:57 +0200 + +irsim (9.7.79-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Fri, 25 Jan 2013 11:12:10 +0100 + +irsim (9.7.78-1) experimental; urgency=low + + * New upstream release + + -- Roland Stigge <stigge@antcom.de> Tue, 25 Sep 2012 13:15:15 +0200 + +irsim (9.7.75-1) unstable; urgency=low + + * New upstream release + * debian/compat: 9 + * debian/control: Standards-Version: 3.9.3 + + -- Roland Stigge <stigge@antcom.de> Sat, 10 Mar 2012 20:43:11 +0100 + +irsim (9.7.74-1) unstable; urgency=low + + * Initial release (Closes: #478112) + + -- Roland Stigge <stigge@antcom.de> Wed, 27 Jul 2011 13:18:46 +0200 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..b637426 --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +tclsubckt/Depend diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..aefebfa --- /dev/null +++ b/debian/control @@ -0,0 +1,25 @@ +Source: irsim +Section: electronics +Priority: extra +Maintainer: Debian QA Group <packages@qa.debian.org> +Build-Depends: autotools-dev, + debhelper (>= 10), + libxt-dev, + m4, + mesa-common-dev, + tcl-dev, + tk-dev, + x11proto-core-dev +Standards-Version: 4.0.0 +Homepage: http://opencircuitdesign.com/irsim/ + +Package: irsim +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Description: switch-level simulator + IRSIM is a tool for simulating digital circuits. It is a "switch-level" + simulator; that is, it treats transistors as ideal switches. Extracted + capacitance and lumped resistance values are used to make the switch a little + bit more realistic than the ideal, using the RC time constants to predict the + relative timing of events. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..f4ffdeb --- /dev/null +++ b/debian/copyright @@ -0,0 +1,34 @@ +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: irsim +Source: http://opencircuitdesign.com/irsim/ + +Files: * +Copyright: 2011 Tim Edwards <tim.edwards@multigig.com> +License: BSD-like + ********************************************************************* + * Copyright (C) 1988, 1990 Stanford University. * + * Permission to use, copy, modify, and distribute this * + * software and its documentation for any purpose and without * + * fee is hereby granted, provided that the above copyright * + * notice appear in all copies. Stanford University * + * makes no representations about the suitability of this * + * software for any purpose. It is provided "as is" without * + * express or implied warranty. Export of this software outside * + * of the United States of America may require an export license. * + ********************************************************************* + +Files: tclsubckt/diglib.c +Copyright: 2007 Tim Edwards <tim.edwards@multigig.com> +License: GPL-2 + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License Version 2 as published + by the Free Software Foundation. + . + On Debian systems, the full text of the GPLv2 can be found in + /usr/share/common-licenses/GPL-2. + +Files: debian/* +Copyright: 2011 Roland Stigge <stigge@antcom.de> +License: same-as-upstream + The Debian packaging of this software is distributed under the same licensing + as the package itself,. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README diff --git a/debian/menu b/debian/menu new file mode 100644 index 0000000..577c8df --- /dev/null +++ b/debian/menu @@ -0,0 +1,2 @@ +?package(irsim):needs="X11" section="Applications/Science/Electronics"\ + title="irsim" command="/usr/bin/irsim" diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch new file mode 100644 index 0000000..3d385c9 --- /dev/null +++ b/debian/patches/01-makefile.patch @@ -0,0 +1,88 @@ +Description: Adjustments to Makefile + This patch contains Debian specific adjustments to the Makefile +Author: Roland Stigge <stigge@antcom.de> + +--- irsim-9.7.93.orig/Makefile ++++ irsim-9.7.93/Makefile +@@ -15,12 +15,10 @@ include defs.mak + all: $(ALL_TARGET) + + standard: +- @echo --- errors and warnings logged in file make.log +- @${MAKE} mains 2>&1 | tee -a make.log ++ ${MAKE} mains + + tcl: +- @echo --- errors and warnings logged in file make.log +- @${MAKE} tcllibrary 2>&1 | tee -a make.log ++ ${MAKE} tcllibrary + + force: clean all + +@@ -33,39 +31,39 @@ config: + tcllibrary: modules + @echo --- making Tcl shared-object libraries + for dir in ${PROGRAMS}; do \ +- (cd $$dir && ${MAKE} tcl-main); done ++ ${MAKE} -C $$dir tcl-main || exit 1; done + + mains: modules + @echo --- making main programs + for dir in ${PROGRAMS}; do \ +- (cd $$dir && ${MAKE} main); done ++ ${MAKE} -C $$dir main || exit 1; done + + modules: + @echo --- making modules + for dir in ${MODULES}; do \ +- (cd $$dir && ${MAKE} module); done ++ ${MAKE} -C $$dir module || exit 1; done + + libs: + @echo --- making libraries + for dir in ${LIBRARIES}; do \ +- (cd $$dir && ${MAKE} lib); done ++ ${MAKE} -C $$dir lib || exit 1; done + + depend: + for dir in ${MODULES} ${PROGRAMS}; do \ +- (cd $$dir && ${MAKE} depend); done ++ ${MAKE} -C $$dir depend || exit 1; done + + install: $(INSTALL_TARGET) + + install-irsim: + @echo --- installing executables to $(DESTDIR)${BINDIR} + @echo --- installing run-time files to $(DESTDIR)${LIBDIR} +- @${MAKE} install-real >> install.log ++ @${MAKE} install-real + + install-real: install-dirs + for dir in ${INSTALL_CAD_DIRS}; do \ +- (cd $$dir && ${MAKE} install); done ++ ${MAKE} -C $$dir install || exit 1; done + for dir in ${PROGRAMS}; do \ +- (cd $$dir && ${MAKE} install); done ++ ${MAKE} -C $$dir install || exit 1; done + + install-tcl-dirs: + ${IRSIMDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR} \ +@@ -78,15 +76,15 @@ install-dirs: + install-tcl: + @echo --- installing executables to $(DESTDIR)${BINDIR} + @echo --- installing run-time files to $(DESTDIR)${LIBDIR} +- @${MAKE} install-tcl-real 2>&1 >> install.log ++ @${MAKE} install-tcl-real + + install-tcl-real: install-tcl-dirs + for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \ +- (cd $$dir && ${MAKE} install-tcl); done ++ ${MAKE} -C $$dir install-tcl || exit 1; done + + clean: + for dir in ${MODULES} ${PROGRAMS} ${UNUSED_MODULES}; do \ +- (cd $$dir && ${MAKE} clean); done ++ ${MAKE} -C $$dir clean; done + ${RM} *.log + + distclean: diff --git a/debian/patches/02-manpages.patch b/debian/patches/02-manpages.patch new file mode 100644 index 0000000..e7c1526 --- /dev/null +++ b/debian/patches/02-manpages.patch @@ -0,0 +1,33 @@ +Description: Manual page fixes + This patch fixes some minor problems in some man pages of irsim. +Author: Roland Stigge <stigge@antcom.de> + +--- irsim-9.7.74.orig/doc/irsim-analyzer.3 ++++ irsim-9.7.74/doc/irsim-analyzer.3 +@@ -1,7 +1,6 @@ + .TH irsim-analyzer 3 "" "" "IRSIM USER'S MANUAL" + .SH NAME +-.nh +-irsim-analyzer ++irsim-analyzer \- A graphical interface to irsim + .SH SYNOPSIS + .B analyzer \fInode...\fP + .SH DESCRIPTION +--- irsim-9.7.74.orig/doc/netchange.5 ++++ irsim-9.7.74/doc/netchange.5 +@@ -1,4 +1,3 @@ +-' square macro + .de Sq + .ie n\\h'-\\w' 'u'^2 + .el \\h'-\\w' 'u'\\u2\\d +--- irsim-9.7.74.orig/doc/irsim.1 ++++ irsim-9.7.74/doc/irsim.1 +@@ -194,7 +194,7 @@ set simulation step size to \fIn\fP ns. + assign \fIvalue\fP to \fIvector\fP + .IP "\fBsetlog\fI[file|off]\fP" 22 + log net changes to file (\fIoff\fP -> no log) +-.IP \fBsetpath \fI[path...]\fP ++.IP "\fBsetpath \fI[path...]\fP" 22 + set search path for cmd files + .IP "\fBstats\fP" 22 + print event statistics diff --git a/debian/patches/03-fhs-images.patch b/debian/patches/03-fhs-images.patch new file mode 100644 index 0000000..2aeb32f --- /dev/null +++ b/debian/patches/03-fhs-images.patch @@ -0,0 +1,43 @@ +Description: FHS adjustments for image files + This patch adjusts some image files (xbm) to be in an FHS conformant location, + not /usr/lib +Author: Roland Stigge <stigge@antcom.de> + +--- irsim-9.7.74.orig/scripts/defs.mak.in ++++ irsim-9.7.74/scripts/defs.mak.in +@@ -35,7 +35,7 @@ DOCDIR = ${libdir}/irsim + SYSDIR = ${libdir}/irsim/sys + PRMDIR = ${libdir}/irsim/prm + TCLDIR = ${libdir}/irsim/tcl +-XBMDIR = ${libdir}/irsim/tcl/bitmaps ++XBMDIR = /usr/share/irsim/bitmaps + + MAIN_EXTRA_LIBS = @extra_libs@ + LD_EXTRA_LIBS = @ld_extra_libs@ +--- irsim-9.7.74.orig/tcltk/irsim.tcl.in ++++ irsim-9.7.74/tcltk/irsim.tcl.in +@@ -332,19 +332,19 @@ label .analyzer.menubar.title -text "log + -anchor w -padx 5 + + set scb(center) [image create bitmap \ +- -file TCL_DIR/bitmaps/center.xbm \ ++ -file /usr/share/irsim/bitmaps/center.xbm \ + -background gray -foreground steelblue] + set scb(lleft) [image create bitmap \ +- -file TCL_DIR/bitmaps/lleft.xbm \ ++ -file /usr/share/irsim/bitmaps/lleft.xbm \ + -background gray -foreground steelblue] + set scb(left) [image create bitmap \ +- -file TCL_DIR/bitmaps/left.xbm \ ++ -file /usr/share/irsim/bitmaps/left.xbm \ + -background gray -foreground steelblue] + set scb(right) [image create bitmap \ +- -file TCL_DIR/bitmaps/right.xbm \ ++ -file /usr/share/irsim/bitmaps/right.xbm \ + -background gray -foreground steelblue] + set scb(rright) [image create bitmap \ +- -file TCL_DIR/bitmaps/rright.xbm \ ++ -file /usr/share/irsim/bitmaps/rright.xbm \ + -background gray -foreground steelblue] + + pack .analyzer.menubar.title -side left -expand true -fill both diff --git a/debian/patches/04-makefile-fix-hardening-ldflags.patch b/debian/patches/04-makefile-fix-hardening-ldflags.patch new file mode 100644 index 0000000..9286a15 --- /dev/null +++ b/debian/patches/04-makefile-fix-hardening-ldflags.patch @@ -0,0 +1,72 @@ +Description: Add hardening flags in Makefiles + At some places, LDFLAGS wasn't used properly in Makefiles. +Author: Roland Stigge <stigge@antcom.de> + +--- irsim-9.7.84.orig/irsim/Makefile ++++ irsim-9.7.84/irsim/Makefile +@@ -22,7 +22,7 @@ tcl-main: tclirsim${SHDLIB_EXT} + tclirsim${SHDLIB_EXT}: ${EXTRA_LIBS} + @echo --- making irsim Tcl library \(tclirsim${SHDLIB_EXT}\) + ${RM} tclirsim${SHDLIB_EXT} +- ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} ${LD_RUN_PATH} \ ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o $@ ${LDDL_FLAGS} ${LD_RUN_PATH} \ + ${EXTRA_LIBS} -lc ${LIBS} ${LD_EXTRA_LIBS} + + $(DESTDIR)${BINDIR}/irsim: +@@ -38,10 +38,10 @@ $(DESTDIR)${BINDIR}/genspktbl: + ${CP} genspktbl $(DESTDIR)${BINDIR}/genspktbl + + gentbl: +- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} gentbl.c -o $@ ${LIBS} ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${DFLAGS} gentbl.c -o $@ ${LIBS} + + genspktbl: +- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} genspktbl.c -o $@ ${LIBS} ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${DFLAGS} genspktbl.c -o $@ ${LIBS} + + install: $(DESTDIR)${BINDIR}/irsim $(DESTDIR)${BINDIR}/gentbl \ + $(DESTDIR)${BINDIR}/genspktbl +--- irsim-9.7.84.orig/random/Makefile ++++ irsim-9.7.84/random/Makefile +@@ -21,7 +21,7 @@ randwrap.o: random.c + random${SHDLIB_EXT}: randwrap.o + @echo --- making random Tcl library + ${RM} random${SHDLIB_EXT} +- ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} randwrap.o \ ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o $@ ${LDDL_FLAGS} randwrap.o \ + ${MAC_SHARED} -lc ${LIBS} ${LD_EXTRA_LIBS} + + install-tcl: $(DESTDIR)${TCLDIR}/random${SHDLIB_EXT} +--- irsim-9.7.84.orig/tclsubckt/Makefile ++++ irsim-9.7.84/tclsubckt/Makefile +@@ -22,7 +22,7 @@ diglib.o: diglib.c + diglib${SHDLIB_EXT}: diglib.o + @echo --- making diglib subcircuit shared library + ${RM} diglib${SHDLIB_EXT} +- ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} diglib.o \ ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o $@ ${LDDL_FLAGS} diglib.o \ + ${MAC_SHARED} -lc ${LIBS} ${LD_EXTRA_LIBS} + + install-tcl: $(DESTDIR)${TCLDIR}/diglib${SHDLIB_EXT} +--- irsim-9.7.84.orig/tcltk/Makefile ++++ irsim-9.7.84/tcltk/Makefile +@@ -26,7 +26,7 @@ install-tcl: irsimexec $(DESTDIR)${BINDI + ${CP} irsimexec $(DESTDIR)${TCLDIR}/irsimexec + + irsimexec: irsimexec.c tclirsim.o +- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} irsimexec.c -o irsimexec \ ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} irsimexec.c -o irsimexec \ + ${LIBS} ${LIB_SPECS} + + irsim.tcl: irsim.tcl.in +--- irsim-9.7.84.orig/rules.mak ++++ irsim-9.7.84/rules.mak +@@ -30,7 +30,7 @@ lib${MODULE}.a: ${OBJS} ${LIB_OBJS} + ${MODULE}: lib${MODULE}.o ${EXTRA_LIBS} + @echo --- building main ${MODULE} + ${RM} ${MODULE} +- ${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} ++ ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} ${DFLAGS} lib${MODULE}.o ${EXTRA_LIBS} -o ${MODULE} ${LIBS} + + clean: + ${RM} ${CLEANS} diff --git a/debian/patches/05-reproducible-build.patch b/debian/patches/05-reproducible-build.patch new file mode 100644 index 0000000..2357322 --- /dev/null +++ b/debian/patches/05-reproducible-build.patch @@ -0,0 +1,11 @@ +--- irsim-9.7.87.orig/irsim/Makefile ++++ irsim-9.7.87/irsim/Makefile +@@ -8,7 +8,7 @@ EXTRA_LIBS = ${IRSIMDIR}/analyzer/libana + ${IRSIMDIR}/base/libbase.o \ + ${MAIN_EXTRA_LIBS} + +-DFLAGS += -DIRSIM_DATE="\"`date`\"" ++DFLAGS += -DIRSIM_DATE="\"`dpkg-parsechangelog -l../debian/changelog --show-field Date`\"" + + CFLAGS += -I${IRSIMDIR}/base + LIBS += ${GR_LIBS} -lm diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..33be153 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,5 @@ +01-makefile.patch +02-manpages.patch +03-fhs-images.patch +04-makefile-fix-hardening-ldflags.patch +05-reproducible-build.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..0a436c2 --- /dev/null +++ b/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +%: + dh $@ --with autotools_dev + +override_dh_auto_install: + dh_auto_install + sed -i -e "s,/usr/bin/wish,$(shell readlink -f /usr/bin/wish)," debian/irsim/usr/bin/irsim 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) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..66a5c43 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=4 +http://opencircuitdesign.com/irsim/download.html .*irsim-(.*).tgz |