[Blends-commit] [SCM] hamradio branch, master, updated. a1e4d7002dd8e758cdac6cab96711093885dab78

[Iain R. Learmonth]

The following commit has been merged in the master branch:
commit a1e4d7002dd8e758cdac6cab96711093885dab78
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sat Nov 15 15:12:54 2014 +0000

    Dropped data-* tasks and replaced with datamodes and packetmodes

diff --git a/tasks/data-aprs b/tasks/data-aprs
deleted file mode 100644
index 8e182d4..0000000
--- a/tasks/data-aprs
+++ /dev/null
@@ -1,14 +0,0 @@
-Task: Data Modes - APRS
-Description: Debian Hamradio APRS Packages
- This metapackage will install packages useful when using
- APRS with Debian.
-
-Depends: aprsdigi,
-         direwolf,
-         soundmodem,
-         xastir
-
-Depends: aprsg
-
-Depends: aprx
-
diff --git a/tasks/data-image b/tasks/data-image
deleted file mode 100644
index 3244f47..0000000
--- a/tasks/data-image
+++ /dev/null
@@ -1,10 +0,0 @@
-Task: Data Modes - Image-based Modes
-Description: Debian Hamradio Image-base Modes Packages
- This metapackage will install packages useful when using
- SSTV, Fax or other image-based modes with Debian.
-
-Depends: acfax,
-         fldigi,
-         hamfax,
-         qsstv
-
diff --git a/tasks/data-text b/tasks/data-text
deleted file mode 100644
index 6f231af..0000000
--- a/tasks/data-text
+++ /dev/null
@@ -1,18 +0,0 @@
-Task: Data Modes - Text-based Modes
-Description: Debian Hamradio Text Modes Packages
- This metapackage will install packages useful when using
- text-based data modes (such as PSK31) with Debian.
-
-Depends: fldigi,
-         flamp,
-         flmsg,
-         flwrap,
-         gpsk31,
-         gmfsk,
-         kpsk,
-         linpsk,
-         phaseshift,
-         twpsk,
-         wsjt,
-         wsjtx
-         
diff --git a/tasks/data-weaksignal b/tasks/data-weaksignal
deleted file mode 100644
index 707762a..0000000
--- a/tasks/data-weaksignal
+++ /dev/null
@@ -1,13 +0,0 @@
-Task: Data Modes - Weak Signal Modes
-Description: Debian Hamradio Weak Signal Modes Packages
- This metapackage will install packages useful when using
- weak signal modes (such as JT65) with Debian.
-
-Depends: wsjt,
-         wsjtx
-
-Depends: wspr
-
-Suggests: kvasd-installer
-Remark: While the installer package is free software, kvasd is not.
-
diff --git a/tasks/datamodes b/tasks/datamodes
new file mode 100644
index 0000000..db5a9b5
--- /dev/null
+++ b/tasks/datamodes
@@ -0,0 +1,25 @@
+Task: Data Modes
+Description: Debian Hamradio Data Modes Packages
+ This metapackage will install packages useful for using data modes, such as
+ RTTY and SSTV, including weak signal modes, such as JT65, with Debian.
+
+Depends: acfax,
+         hamfax,
+         fldigi,
+         flamp,
+         flmsg,
+         flwrap,
+         gpsk31,
+         gmfsk,
+         kpsk,
+         linpsk,
+         phaseshift,
+         qsstv,
+         twpsk,
+         wsjt,
+         wsjtx,
+         wspr
+
+Suggests: kvasd-installer
+Remark: While the installer package is free software, kvasd is not.
+
diff --git a/tasks/data-ax25 b/tasks/packetmodes
similarity index 53%
rename from tasks/data-ax25
rename to tasks/packetmodes
index fcbc98f..5085c38 100644
--- a/tasks/data-ax25
+++ b/tasks/packetmodes
@@ -1,9 +1,12 @@
-Task: Data Modes - AX.25
-Description: Debian Hamradio AX.25 Packages
- This metapackage will install packages useful when using
- AX.25 with Debian.
+Task: Packet Modes
+Description: Debian Hamradio Packet Mode Packages
+ This metapackage will install packages useful when using AX.25, including IPv4
+ over AX.25 and APRS, with Debian.
 
-Depends: ax25-apps,
+Depends: aprsdigi,
+         aprsg,
+         aprx,
+         ax25-apps,
          ax25-node,
          ax25-tools,
          ax25-xtools,
@@ -14,7 +17,8 @@ Depends: ax25-apps,
          linamc,
          multimon,
          node,
-         soundmodem
+         soundmodem,
+         xastir
 
 Suggests: z8530-utils2
 Remark: This is a hardware specific package.

-- 
Packaging for Debian Hamradio Pure Blend