[Blends-commit] [SCM] science branch, master, updated. c5f32703829ec6bd43385c3fba9533188c72beae

Tue Apr 5 12:33:43 UTC 2016

The following commit has been merged in the master branch:
commit 7e58509786d44c222051c274dc9344b18f9d9a0a
Author: Ole Streicher <ole at aip.de>
Date:   Tue Apr 5 14:12:17 2016 +0200

    Make astronomy metapackages transional

diff --git a/debian-science-tasks.desc b/debian-science-tasks.desc
index 87139de..8a39b62 100644
--- a/debian-science-tasks.desc
+++ b/debian-science-tasks.desc
@@ -4,26 +4,6 @@ Section: debian-science
 Description: Debian Science Pure Blend
  .
 
-Task: science-astronomy
-Parent: debian-science
-Section: debian-science
-Description: Debian Science Astronomy transitional package
- Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
- control on the topics to install. To ease the transition, this package will
- install all user related tasks from Debian-Astro.
-Key: 
- science-astronomy
-
-Task: science-astronomy-dev
-Parent: debian-science
-Section: debian-science
-Description: Debian Science Astronomy-dev transitional package
- Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
- control on the topics to install. To ease the transition, this package will
- install all development related tasks from Debian-Astro.
-Key: 
- science-astronomy-dev
-
 Task: science-bci
 Parent: debian-science
 Section: debian-science
diff --git a/debian/control b/debian/control
index da55557..da7db54 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Frederic Daniel Luc Lehobey <Frederic at Lehobey.net>,
 Build-Depends-Indep: blends-dev (>= 0.6.15)
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/blends/projects/science.git
-Vcs-Git: git://anonscm.debian.org/blends/projects/science.git
+Vcs-Git: https://anonscm.debian.org/git/blends/projects/science.git
 Homepage: http://wiki.debian.org/DebianScience/
 
 Package: science-tasks
@@ -20,6 +20,41 @@ Description: Debian Science tasks for tasksel
  additional tasks for tasksel.  If this package will be installed all tasks
  which are provided by Debian Science will be added to the tasksel menu.
 
+Package: science-astronomy
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: astro-catalogs,
+         astro-datareduction,
+         astro-education,
+         astro-frameworks,
+         astro-gdl,
+         astro-publication,
+         astro-python,
+         astro-python3,
+         astro-simulation,
+         astro-telescopecontrol,
+         astro-tools,
+         astro-viewers
+Description: Debian Science Astronomy transitional package
+ Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
+ control on the topics to install. To ease the transition, this package will
+ install all user related tasks from Debian-Astro.
+
+Package: science-astronomy-dev
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: astro-development,
+         astro-java,
+         astro-python,
+         astro-python3,
+         astro-tcltk
+Description: Debian Science Astronomy-dev transitional package
+ Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
+ control on the topics to install. To ease the transition, this package will
+ install all development related tasks from Debian-Astro.
+
 Package: science-config
 Architecture: all
 Depends: adduser, ${misc:Depends}, menu, blends-common (>= 0.6.15)
@@ -101,9 +136,7 @@ Description: Debian Science Project config package
 Package: science-all
 Section: metapackages
 Architecture: all
-Recommends: science-astronomy,
- science-astronomy-dev,
- science-biology,
+Recommends: science-biology,
  science-chemistry,
  science-dataacquisition,
  science-dataacquisition-dev,
@@ -148,26 +181,6 @@ Description: Default selection of tasks for Debian Science
  This package is part of the Debian Science Pure Blend and installs all
  tasks for a default installation of this blend.
 
-Package: science-astronomy
-Section: metapackages
-Architecture: all
-Depends: science-tasks (= ${binary:Version}), science-config (= ${binary:Version})
-Recommends: astro-catalogs
-Description: Debian Science Astronomy transitional package
- Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
- control on the topics to install. To ease the transition, this package will
- install all user related tasks from Debian-Astro.
-
-Package: science-astronomy-dev
-Section: metapackages
-Architecture: all
-Depends: science-tasks (= ${binary:Version}), science-config (= ${binary:Version})
-Recommends: astro-development
-Description: Debian Science Astronomy-dev transitional package
- Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
- control on the topics to install. To ease the transition, this package will
- install all development related tasks from Debian-Astro.
-
 Package: science-biology
 Section: metapackages
 Architecture: all
diff --git a/debian/control.stub b/debian/control.stub
index b698296..863b860 100644
--- a/debian/control.stub
+++ b/debian/control.stub
@@ -19,3 +19,38 @@ Description: Debian Science tasks for tasksel
  additional tasks for tasksel.  If this package will be installed all tasks
  which are provided by Debian Science will be added to the tasksel menu.
 
+Package: science-astronomy
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: astro-catalogs,
+         astro-datareduction,
+         astro-education,
+         astro-frameworks,
+         astro-gdl,
+         astro-publication,
+         astro-python,
+         astro-python3,
+         astro-simulation,
+         astro-telescopecontrol,
+         astro-tools,
+         astro-viewers
+Description: Debian Science Astronomy transitional package
+ Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
+ control on the topics to install. To ease the transition, this package will
+ install all user related tasks from Debian-Astro.
+
+Package: science-astronomy-dev
+Priority: extra
+Section: oldlibs
+Architecture: all
+Depends: astro-development,
+         astro-java,
+         astro-python,
+         astro-python3,
+         astro-tcltk
+Description: Debian Science Astronomy-dev transitional package
+ Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
+ control on the topics to install. To ease the transition, this package will
+ install all development related tasks from Debian-Astro.
+
diff --git a/tasks/astronomy b/tasks/astronomy
deleted file mode 100644
index fb32e1a..0000000
--- a/tasks/astronomy
+++ /dev/null
@@ -1,18 +0,0 @@
-Task: Astronomy
-Description: Debian Science Astronomy transitional package
- Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
- control on the topics to install. To ease the transition, this package will
- install all user related tasks from Debian-Astro.
-
-Depends: astro-catalogs,
-         astro-datareduction,
-         astro-education,
-         astro-frameworks,
-         astro-gdl,
-         astro-publication,
-         astro-python,
-         astro-python3,
-         astro-simulation,
-         astro-telescopecontrol,
-         astro-tools,
-         astro-viewers
diff --git a/tasks/astronomy-dev b/tasks/astronomy-dev
deleted file mode 100644
index 97f0aa6..0000000
--- a/tasks/astronomy-dev
+++ /dev/null
@@ -1,11 +0,0 @@
-Task: Astronomy-dev
-Description: Debian Science Astronomy-dev transitional package
- Debian-Astro is now a separate Debian Pure Blend and allows a fine-grained
- control on the topics to install. To ease the transition, this package will
- install all development related tasks from Debian-Astro.
-
-Depends: astro-development,
-         astro-java,
-         astro-python,
-         astro-python3,
-         astro-tcltk

-- 
Debian Science Blend

