[26304] in Source-Commits
/svn/athena r25506 - in trunk/debathena/meta: thirdparty-audio/debian thirdparty-graphics/debian thirdparty-languages/debian thirdparty-libraries/debian thirdparty-programming/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue May 15 16:35:34 2012
Date: Tue, 15 May 2012 16:35:32 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205152035.q4FKZWvZ019580@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-15 16:35:32 -0400 (Tue, 15 May 2012)
New Revision: 25506
Modified:
trunk/debathena/meta/thirdparty-audio/debian/changelog
trunk/debathena/meta/thirdparty-audio/debian/control.in
trunk/debathena/meta/thirdparty-graphics/debian/changelog
trunk/debathena/meta/thirdparty-graphics/debian/control.in
trunk/debathena/meta/thirdparty-languages/debian/changelog
trunk/debathena/meta/thirdparty-languages/debian/control.in
trunk/debathena/meta/thirdparty-libraries/debian/changelog
trunk/debathena/meta/thirdparty-libraries/debian/control.in
trunk/debathena/meta/thirdparty-programming/debian/changelog
trunk/debathena/meta/thirdparty-programming/debian/control.in
trunk/debathena/meta/thirdparty-programming/debian/rules
Log:
In thirdparty-audio:
* Demote xmcd to recommendation; gone as of precise
In thirdparty-graphics:
* Demote povray, sdr, and xprint-utils to recommendations
* glutg3 is now called freeglut3
* libghc6 is now libghc
In thirdparty-languages:
* jython-gcj is now part of jython
In thirdparty-libraries:
* Stop depending on specific versions and depend on the generic -dev
packages for libvtk, libginac, libcln, libitpp, libpari (including
gmp3) and libboostc
* vtk-tcl got renamed to tcl-vtk
* libppl got a version boost
* xulrunner-dev demoted to a recommendation
In thirdparty-programming:
* Ironpython is gone in Precise
Modified: trunk/debathena/meta/thirdparty-audio/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-audio/debian/changelog 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-audio/debian/changelog 2012-05-15 20:35:32 UTC (rev 25506)
@@ -1,3 +1,9 @@
+debathena-thirdparty-audio (1.1) unstable; urgency=low
+
+ * Demote xmcd to recommendation; gone as of precise
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 15 May 2012 12:59:35 -0400
+
debathena-thirdparty-audio (1.0) unstable; urgency=low
* First non-equivs version
Modified: trunk/debathena/meta/thirdparty-audio/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-audio/debian/control.in 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-audio/debian/control.in 2012-05-15 20:35:32 UTC (rev 25506)
@@ -10,8 +10,8 @@
Depends: mpg123,
gxmms2,
xmms2,
- xmcd,
${misc:Depends}
+Recommends: xmcd,
Description: Debathena metapackage for third-party audio software
This includes a set of subpackages of commonly-used third-party software
within the audio domain. It is intended for cluster machines though usable
Modified: trunk/debathena/meta/thirdparty-graphics/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-graphics/debian/changelog 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-graphics/debian/changelog 2012-05-15 20:35:32 UTC (rev 25506)
@@ -1,3 +1,11 @@
+debathena-thirdparty-graphics (1.1.3) unstable; urgency=low
+
+ * Demote povray, sdr, and xprint-utils to recommendations
+ * glutg3 is now called freeglut3
+ * libghc6 is now libghc
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 15 May 2012 14:59:38 -0400
+
debathena-thirdparty-graphics (1.1.2) unstable; urgency=low
* 8 spaces is not a tab.
Modified: trunk/debathena/meta/thirdparty-graphics/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-graphics/debian/control.in 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-graphics/debian/control.in 2012-05-15 20:35:32 UTC (rev 25506)
@@ -12,13 +12,11 @@
inventor-doc,
libinventor0,
imagemagick,
- freeglut3-dev,
- libghc6-glut-dev,
- libghc6-glut-doc,
- libghc6-glut-prof,
- glutg3,
- glutg3-dev,
- glut-doc,
+ freeglut3 | glutg3,
+ freeglut3-dev | glutg3-dev,
+ libghc-glut-dev | libghc6-glut-dev,
+ libghc-glut-doc | libghc6-glut-doc,
+ libghc-glut-prof | libghc6-glut-prof,
libglui-dev,
libglui2c2,
inkscape,
@@ -36,10 +34,6 @@
netpbm,
libnetpbm10-dev,
xcircuit,
- povray,
- povray-doc,
- povray-examples,
- povray-includes,
dia,
djvulibre-bin,
ipe,
@@ -51,8 +45,6 @@
xpaint,
blender,
gerbv,
- sdr,
- xprint-utils,
pdftoipe,
mgp,
graphviz,
@@ -61,6 +53,13 @@
Recommends: inventor-dev,
inventor-clients,
gle-graphics,
+ glut-doc,
+ povray,
+ povray-doc,
+ povray-examples,
+ povray-includes,
+ sdr,
+ xprint-utils,
Description: Debathena metapackage for third-party graphics software
This includes a set of subpackages of commonly-used third-party software
within the graphics domain. It is intended for cluster machines though usable
Modified: trunk/debathena/meta/thirdparty-languages/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-languages/debian/changelog 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-languages/debian/changelog 2012-05-15 20:35:32 UTC (rev 25506)
@@ -1,3 +1,9 @@
+debathena-thirdparty-languages (1.1) unstable; urgency=low
+
+ * jython-gcj is now part of jython
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 15 May 2012 16:09:42 -0400
+
debathena-thirdparty-languages (1.0) unstable; urgency=low
* First non-equivs version
Modified: trunk/debathena/meta/thirdparty-languages/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-languages/debian/control.in 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-languages/debian/control.in 2012-05-15 20:35:32 UTC (rev 25506)
@@ -19,14 +19,13 @@
gfortran-multilib,
ant-doc,
valgrind,
- jython,
+ jython-gcj | jython,
jython-doc,
- jython-gcj,
clisp,
clisp-doc,
f2c,
ftnchek,
- gcj,
+ gcj-jdk | gcj,
gnudatalanguage,
gfortran,
ghc6,
Modified: trunk/debathena/meta/thirdparty-libraries/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-libraries/debian/changelog 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-libraries/debian/changelog 2012-05-15 20:35:32 UTC (rev 25506)
@@ -1,3 +1,14 @@
+debathena-thirdparty-libraries (1.0.2) unstable; urgency=low
+
+ * Stop depending on specific versions and depend on the generic -dev
+ packages for libvtk, libginac, libcln, libitpp, libpari (including
+ gmp3) and libboostc
+ * vtk-tcl got renamed to tcl-vtk
+ * libppl got a version boost
+ * xulrunner-dev demoted to a recommendation
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 15 May 2012 16:29:41 -0400
+
debathena-thirdparty-libraries (1.0.1) unstable; urgency=low
* No-change rebuild
Modified: trunk/debathena/meta/thirdparty-libraries/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-libraries/debian/control.in 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-libraries/debian/control.in 2012-05-15 20:35:32 UTC (rev 25506)
@@ -24,15 +24,13 @@
libcairomm-1.0-doc,
libcairo-ocaml,
libcairo-ocaml-dev,
- libvtk5.2 | libvtk5.4,
libvtk5-dev,
- libvtk5.2-qt4 | libvtk5.4-qt4,
libvtk5-qt4-dev,
python-pyvtk,
python-vtk,
vtk-doc,
vtk-examples,
- vtk-tcl,
+ vtk-tcl | tcl-vtk,
vtkdata,
qt4-designer,
qt4-qtconfig,
@@ -45,22 +43,17 @@
libfftw3-dev,
libfftw3-doc,
mffm-fftw-dev,
- libginac1.4 | libginac1.5,
libginac-dev,
ginac-tools,
- libcln5 | libcln6,
libcln-dev,
- libitpp6 | libitpp6gf,
libitpp-dev,
libqhull-dev,
libqhull5,
qhull-bin,
- libgmp3-dev,
- libgmp3-doc,
+ libgmp3-doc | libgmp10-doc,
libgmpxx4ldbl,
python-gmpy,
- libpari2-gmp,
- libpari2-gmp-dev,
+ libpari-dev,
libgmp-ocaml,
libgmp-ocaml-dev,
libwxbase2.6-dev,
@@ -70,9 +63,8 @@
libtiff4-dev,
libnspr4-dev,
libpoppler-glib-dev,
- libgtksourceview-dev,
+ libgtksourceview-dev | libgtksourceview2.0-dev,
libnss3-dev,
- xulrunner-1.9-dev | xulrunner-1.9.1-dev | xulrunner-dev,
liblog4net1.2-cil,
dx,
dx-doc,
@@ -84,14 +76,13 @@
libgl1-mesa-dev,
wine,
wine-dev,
- libboost1.40-dev | libboost1.42-dev,
+ libboost-dev,
fftw-dev,
gtk-sharp2,
libfuse-dev, fuse-utils,
- libcv4 | libcv2.1,
libcv-dev,
python-psycopg2,
- libppl-c2,
+ libppl-c2 | libppl-c4,
libcurl4-gnutls-dev,
libmpfr-dev, ${debathena-maybe-libmpfr1ldbl},
${misc:Depends}
@@ -100,6 +91,7 @@
libatlas-sse2-dev,
libatlas-doc,
libmpc2,
+ xulrunner-dev,
Description: Debathena metapackage for third-party libraries software
This includes a set of subpackages of commonly-used third-party software
within the libraries domain. It is intended for cluster machines though usable
Modified: trunk/debathena/meta/thirdparty-programming/debian/changelog
===================================================================
--- trunk/debathena/meta/thirdparty-programming/debian/changelog 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-programming/debian/changelog 2012-05-15 20:35:32 UTC (rev 25506)
@@ -1,3 +1,9 @@
+debathena-thirdparty-programming (1.1) unstable; urgency=low
+
+ * Ironpython is gone in Precise
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 15 May 2012 13:03:45 -0400
+
debathena-thirdparty-programming (1.0) unstable; urgency=low
* First non-equivs version
Modified: trunk/debathena/meta/thirdparty-programming/debian/control.in
===================================================================
--- trunk/debathena/meta/thirdparty-programming/debian/control.in 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-programming/debian/control.in 2012-05-15 20:35:32 UTC (rev 25506)
@@ -7,9 +7,8 @@
Package: debathena-thirdparty-programming
Architecture: all
-Depends: fltk1.1-doc,
- libfltk1.1,
- libfltk1.1-dev,
+Depends: libfltk1.3 | libfltk1.1,
+ libfltk1.3-dev | libfltk1.1-dev,
tcl-dev,
tk-dev,
fluid,
@@ -19,7 +18,7 @@
monodoc-browser,
mono-mcs,
mono-utils,
- ironpython,
+ ${debathena-maybe-ironpython},
ikvm,
${misc:Depends}
Description: Debathena metapackage for third-party programming software
Modified: trunk/debathena/meta/thirdparty-programming/debian/rules
===================================================================
--- trunk/debathena/meta/thirdparty-programming/debian/rules 2012-05-15 16:12:50 UTC (rev 25505)
+++ trunk/debathena/meta/thirdparty-programming/debian/rules 2012-05-15 20:35:32 UTC (rev 25506)
@@ -1,3 +1,11 @@
#!/usr/bin/make -f
+HAVE_IRONPYTHON = $(shell apt-cache show ironpython 2>/dev/null | grep -q '^Version:' && echo y)
+
+ifeq ($(HAVE_IRONPYTHON),y)
+ binary-predeb/debathena-thirdparty-programming::
+ echo "debathena-maybe-ironpython=ironpython" >> debian/debathena-thirdparty-programming.substvars
+endif
+
+
include /usr/share/cdbs/1/rules/debhelper.mk
