diff options
| author |  courant <courant@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2002-01-23 09:09:31 +0000 |
|---|---|---|
| committer | courant <courant@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2002-01-23 09:09:31 +0000 |
| commit | 58c4a23cc2d7b01bbc6a7e60d6d074bb0a0e5b26 (patch) | |
| tree | 1b7e8ac7c59ea76b83146b35ab7e8602c8262a8f | |
| parent | 714da7fa70765452831175fa1637dbc5436ca6a4 (diff) | |
paquet Debian 7.2-3
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2424 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | distrib/.cvsignore | 1 | ||||
| -rw-r--r-- | distrib/Makefile | 16 | ||||
| -rw-r--r-- | distrib/debian/changelog | 6 | ||||
| -rw-r--r-- | distrib/debian/control | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/distrib/.cvsignore b/distrib/.cvsignore index e0bfbee45..33bde2667 100644 --- a/distrib/.cvsignore +++ b/distrib/.cvsignore @@ -14,4 +14,5 @@ contrib-* patch-* deb_build coq.spec +coq_* sun4u diff --git a/distrib/Makefile b/distrib/Makefile index 2bdf0fb03..30bbc830e 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -29,6 +29,7 @@ COQPACKAGE=coq-${VERSION} COQRPMPACKAGE=coq-${VERSION}-${RELEASENUM} COQDEBPACKAGE=coq_${VERSION}-${RELEASENUM}_i386.deb COQDEBCHANGES=coq_${VERSION}-${RELEASENUM}_*.changes +COQDEBORIG=coq_${VERSION}.orig ###################### @@ -304,13 +305,18 @@ patch-ftp-install: prep-ftp-install cp patch-${VERSION}-$(PREVIOUSVERSION).gz ${FTPDIR}/V${VERSION}/ chmod g+w ${FTPDIR}/V${VERSION}/patch-${VERSION}-$(PREVIOUSVERSION).gz -deb: ${COQPACKAGE}.tar.gz +${COQDEBORIG}.tar.gz: ${COQPACKAGE}.tar.gz + tar xzf ${COQPACKAGE}.tar.gz + mv ${COQPACKAGE} ${COQDEBORIG} + tar czf ${COQDEBORIG}.tar.gz ${COQDEBORIG} + rm -rf ${COQDEBORIG} + +deb: ${COQDEBORIG}.tar.gz ${COQPACKAGE}.tar.gz rm -rf deb_build mkdir -p deb_build - cd deb_build ; tar xzf ../${COQPACKAGE}.tar.gz - cd deb_build ; mv ${COQPACKAGE} ${COQPACKAGE}.orig + cd deb_build ; cp ../${COQDEBORIG}.tar.gz . cd deb_build ; tar xzf ../${COQPACKAGE}.tar.gz cp -a debian deb_build/${COQPACKAGE} rm -rf deb_build/${COQPACKAGE}/debian/CVS - cd deb_build/${COQPACKAGE} ; dpkg-buildpackage -rfakeroot -uc -us - lintian deb_build/${COQDEBCHANGES} + cd deb_build/${COQPACKAGE} ; dpkg-buildpackage -rfakeroot -uc -us 2>&1 | tee ../../deb.log + lintian deb_build/${COQDEBCHANGES} || true diff --git a/distrib/debian/changelog b/distrib/debian/changelog index 1bff80886..42dc8fa86 100644 --- a/distrib/debian/changelog +++ b/distrib/debian/changelog @@ -1,3 +1,9 @@ +coq (7.2-3) unstable; urgency=low + * Workaround for problems with buildd/apt trying to install camlp4 + (closes: Bug#130046). + + -- Judicaël Courant <Judicael.Courant@lri.fr> Mon, 21 Jan 2002 09:46:16 +0100 + coq (7.2-2) unstable; urgency=low * Build-Depends now requires camlp4 instead of camlp4 (>=3.01) since diff --git a/distrib/debian/control b/distrib/debian/control index afd46f1fc..ca6570294 100644 --- a/distrib/debian/control +++ b/distrib/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Judicaël Courant <Judicael.Courant@lri.fr> Standards-Version: 3.5.3 -Build-Depends: debhelper (>= 3), ocaml (>= 3.01), camlp4 +Build-Depends: debhelper (>= 3), ocaml (>= 3.01), ocaml (>=3.04) | camlp4 Package: coq Architecture: any |