diff --git a/alliance/src/Makefile.am b/alliance/src/Makefile.am index 08cac3ca..e9aebc83 100644 --- a/alliance/src/Makefile.am +++ b/alliance/src/Makefile.am @@ -3,4 +3,17 @@ SUBDIRS = @TOOLSDIRS@ EXTRA_DIST = autostuff alliance.m4 motif.m4 oldgcc.m4 xpm.m4 build depcomp \ COPYING-2.0 COPYING.LIB-2.0 LICENCE \ README README.macosx \ - FAQ CHANGES + FAQ CHANGES \ + \ + debian/control \ + debian/copyright \ + debian/changelog \ + debian/rules \ + debian/alliance.doc-base \ + debian/alliance.postinst \ + debian/alliance.postrm \ + debian/compat \ + debian/docs + \ + debian/patches \ + debian/source/format diff --git a/alliance/src/debian/Makefile.am b/alliance/src/debian/Makefile.am deleted file mode 100644 index 01cc35a8..00000000 --- a/alliance/src/debian/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -SUBDIRS = patches source - -EXTRA_DIST = control \ - copyright \ - changelog \ - rules \ - alliance.doc-base \ - alliance.postinst \ - alliance.postrm \ - compat \ - docs diff --git a/alliance/src/debian/alliance.doc-base b/alliance/src/debian/alliance.doc-base index 6113b127..c860934b 100644 --- a/alliance/src/debian/alliance.doc-base +++ b/alliance/src/debian/alliance.doc-base @@ -1,5 +1,5 @@ Document: alliance Title: Alliance Documentation Abstract: VLSI CAD Tools Documentation -Section: Science/Electronics +Section: Electronics diff --git a/alliance/src/debian/changelog b/alliance/src/debian/changelog index b0ecb419..8c607179 100644 --- a/alliance/src/debian/changelog +++ b/alliance/src/debian/changelog @@ -1,3 +1,12 @@ +alliance (5.0-20120503-1) lucid; urgency=low + + * New upstream release. Closes: #00002 + * Correct druc NWELL merging problem (do not compile with -g -02). + * Includes patches submiteds by Naohiko Shimizu (compatibility with pharosc). + * Reorganisation of alliance-examples, so they can run everywhere. + + -- Jean-Paul Chaput Sat, 05 May 2012 17:32:36 +0200 + alliance (5.0-20110203-1) unstable; urgency=low * Initial release. Closes: #00001 diff --git a/alliance/src/debian/control b/alliance/src/debian/control index 348a1584..75d2fd1d 100644 --- a/alliance/src/debian/control +++ b/alliance/src/debian/control @@ -1,5 +1,5 @@ Source: alliance -Section: Science/Electronics +Section: Electronics Priority: optional Maintainer: Jean-Paul Chaput Build-Depends: debhelper (>= 7), @@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7), libxp-dev, libxt-dev, libxpm-dev -Homepage: http://www-asim.lip6.fr/recherche/alliance/ +Homepage: https://soc-extras.lip6.fr/en/alliance-abstract-en/ Standards-Version: 3.8.4 Package: alliance diff --git a/alliance/src/debian/files b/alliance/src/debian/files index 8a9f55b5..c43bdc2b 100644 --- a/alliance/src/debian/files +++ b/alliance/src/debian/files @@ -1,9 +1 @@ -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional -alliance_5.0-20110203-1_i386.deb Science/Electronics optional +alliance_5.0-20120503-1_i386.deb Electronics optional diff --git a/alliance/src/debian/patches/Makefile.am b/alliance/src/debian/patches/Makefile.am deleted file mode 100644 index c8b28e0b..00000000 --- a/alliance/src/debian/patches/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -EXTRA_DITS = diff --git a/alliance/src/debian/rules b/alliance/src/debian/rules index 38844c62..c710b1e1 100755 --- a/alliance/src/debian/rules +++ b/alliance/src/debian/rules @@ -14,23 +14,25 @@ export DH_VERBOSE=1 override_dh_auto_configure: - ./configure --prefix=/usr/lib/alliance --enable-alc-shared --disable-static + ./configure --prefix=/usr --enable-alc-shared --disable-static override_dh_makeshlibs: dh_makeshlibs - destdir="`pwd`/debian/alliance"; \ - ldsoconfdir="$${destdir}/etc/ld.so.conf.d"; \ - allianceldsoconf="$${ldsoconfdir}/alliance.conf"; \ - if [ ! -d "$${ldsoconfdir}" ]; then mkdir -p "$${ldsoconfdir}"; fi; \ - echo "# Alliance VLSI design system" > $${allianceldsoconf}; \ - echo "/usr/lib/alliance/lib" >> $${allianceldsoconf}; + +# Now install directly in /usr/lib. +# destdir="`pwd`/debian/alliance"; \ +# ldsoconfdir="$${destdir}/etc/ld.so.conf.d"; \ +# allianceldsoconf="$${ldsoconfdir}/alliance.conf"; \ +# if [ ! -d "$${ldsoconfdir}" ]; then mkdir -p "$${ldsoconfdir}"; fi; \ +# echo "# Alliance VLSI design system" > $${allianceldsoconf}; \ +# echo "/usr/lib/alliance/lib" >> $${allianceldsoconf}; override_dh_auto_install: dh_auto_install destdir="`pwd`/debian/alliance"; \ - prefix="/usr/lib/alliance"; \ + prefix="/usr"; \ sharedir="/usr/share"; \ alliancesharedir="$${sharedir}/alliance"; \ celldir="$${alliancesharedir}/cell"; \ @@ -47,7 +49,11 @@ override_dh_auto_install: if [ ! -d "$${destdir}$${alliancesharedir}" ]; then mkdir -p "$${destdir}$${alliancesharedir}"; fi; \ mv $${destdir}$${prefix}/cells $${destdir}$${alliancesharedir}; \ if [ ! -d "$${destdir}$${examplesdir}" ]; then mkdir -p "$${destdir}$${examplesdir}"; fi; \ - mv "$${destdir}$${prefix}/examples/alliance-examples/"* "$${destdir}$${examplesdir}"; \ + mv "$${destdir}$${prefix}/examples/alliance-examples" "$${destdir}$${examplesdir}"; \ + mv "$${destdir}$${prefix}/examples/alliance-run" "$${destdir}$${examplesdir}"; \ + mv "$${destdir}$${prefix}/examples/regression.sh" "$${destdir}$${examplesdir}"; \ + chmod a+x "$${destdir}$${examplesdir}/regression.sh" \ + "$${destdir}$${examplesdir}/alliance-run/"*.*sh; \ rmdir "$${destdir}$${prefix}/examples/alliance-examples"; \ rmdir "$${destdir}$${prefix}/examples"; \ mv "$${destdir}$${prefix}/tutorials" "$${destdir}$${docdir}"; \ diff --git a/alliance/src/debian/source/Makefile.am b/alliance/src/debian/source/Makefile.am deleted file mode 100644 index 5ce440c0..00000000 --- a/alliance/src/debian/source/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -EXTRA_DIST = format