[paketler-commits] r56085 - in 2008/applications/hardware/alsa-tools: . files

paketler-commits at pardus.org.tr paketler-commits at pardus.org.tr
21 Kas 2008 Cum 14:32:57 EET


Author: eki
Date: Fri Nov 21 14:32:56 2008
New Revision: 56085

Added:
   2008/applications/hardware/alsa-tools/files/alsa-tools.xpm
      - copied unchanged from r56084, devel/applications/hardware/alsa-tools/files/alsa-tools.xpm
   2008/applications/hardware/alsa-tools/files/echomixer.desktop
      - copied unchanged from r56084, devel/applications/hardware/alsa-tools/files/echomixer.desktop
   2008/applications/hardware/alsa-tools/files/envy24control.desktop
      - copied unchanged from r56084, devel/applications/hardware/alsa-tools/files/envy24control.desktop
   2008/applications/hardware/alsa-tools/files/firmware_locations.patch
      - copied unchanged from r56084, devel/applications/hardware/alsa-tools/files/firmware_locations.patch
   2008/applications/hardware/alsa-tools/files/hdspconf.desktop
      - copied unchanged from r56084, devel/applications/hardware/alsa-tools/files/hdspconf.desktop
   2008/applications/hardware/alsa-tools/files/hdspmixer.desktop
      - copied unchanged from r56084, devel/applications/hardware/alsa-tools/files/hdspmixer.desktop
   2008/applications/hardware/alsa-tools/files/rmedigicontrol.desktop
      - copied unchanged from r56084, devel/applications/hardware/alsa-tools/files/rmedigicontrol.desktop
Modified:
   2008/applications/hardware/alsa-tools/actions.py
   2008/applications/hardware/alsa-tools/files/usx2yloader_udev.patch
   2008/applications/hardware/alsa-tools/pspec.xml
Log:
merge : Version bump to the latest stable 1.0.18,
- Add firmware_locations.patch for installing firmwares into /lib/firmware,
- Split the package for separating GUI and console tools

Modified: 2008/applications/hardware/alsa-tools/actions.py
=================================================================
--- 2008/applications/hardware/alsa-tools/actions.py	(original)
+++ 2008/applications/hardware/alsa-tools/actions.py	Fri Nov 21 14:32:56 2008
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2007 TUBITAK/UEKAE
+# Copyright 2007-2008 TUBITAK/UEKAE
 # Licensed under the GNU General Public License, version 2.
 # See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
@@ -10,17 +10,23 @@
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
-alsa_tools = ["ac3dec","envy24control","rmedigicontrol","hdsploader", "mixartloader","vxloader",
-              "usx2yloader","sscape_ctl","sb16_csp","as10k1","ld10k1", "us428control"]
+console_tools = ["ac3dec", "hdsploader",
+                 "mixartloader", "vxloader",
+                 "usx2yloader", "sscape_ctl",
+                 "sb16_csp", "as10k1", "ld10k1",
+                 "us428control", "seq/sbiload"]
 
-docs = ["README","ChangeLog"]
+gui_tools = ["envy24control", "rmedigicontrol", "hdspconf",
+             "hdspmixer", "echomixer", "qlo10k1"]
 
-WorkDir = "alsa-tools-1.0.17"
+alsa_tools = gui_tools + console_tools
+
+docs = ["README", "ChangeLog", "AUTHORS", "COPYING", "NEWS", "TODO"]
 
 def setup():
     for tool in alsa_tools:
         shelltools.cd(tool)
-        autotools.configure("--with-gtk2")
+        autotools.configure()
         shelltools.cd("..")
 
 def build():
@@ -35,6 +41,14 @@
         autotools.rawInstall("DESTDIR=\"%s\"" % get.installDIR())
 
         for doc in docs:
-            pisitools.insinto("/usr/share/doc/%s/%s" % (get.srcTAG(),tool), doc)
+            if tool in gui_tools:
+                srctag = "alsa-tools-gui-%s-%s" % (get.srcVERSION(), get.srcRELEASE())
+            else:
+                srctag = get.srcTAG()
+
+            pisitools.insinto("/usr/share/doc/%s/%s" % (srctag, tool), doc)
 
         shelltools.cd("..")
+
+    pisitools.remove("/usr/share/applications/hdspmixer.desktop")
+    pisitools.remove("/usr/share/applications/hdspconf.desktop")

Modified: 2008/applications/hardware/alsa-tools/files/usx2yloader_udev.patch
=================================================================
--- 2008/applications/hardware/alsa-tools/files/usx2yloader_udev.patch	(original)
+++ 2008/applications/hardware/alsa-tools/files/usx2yloader_udev.patch	Fri Nov 21 14:32:56 2008
@@ -1,9 +1,9 @@
-diff -Nur alsa-tools-1.0.16-old/usx2yloader/Makefile.am alsa-tools-1.0.16/usx2yloader/Makefile.am
---- alsa-tools-1.0.16-old/usx2yloader/Makefile.am	2008-04-08 16:39:28.000000000 +0300
-+++ alsa-tools-1.0.16/usx2yloader/Makefile.am	2008-04-08 16:42:37.000000000 +0300
+diff -Naur alsa-tools-1.0.18/usx2yloader/Makefile.am alsa-tools-1.0.18-patched/usx2yloader/Makefile.am
+--- alsa-tools-1.0.18/usx2yloader/Makefile.am	2008-10-29 14:42:12.000000000 +0200
++++ alsa-tools-1.0.18-patched/usx2yloader/Makefile.am	2008-10-31 15:14:01.000000000 +0200
 @@ -11,8 +11,8 @@
  
- EXTRA_DIST = depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
+ EXTRA_DIST = gitcompile depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
  
 -hotplug_files = tascam_fw.usermap tascam_fw tascam_fpga
 -hotplugdir = /etc/hotplug/usb
@@ -12,16 +12,16 @@
  hotplug_SCRIPTS = $(hotplug_files)
  
  
-diff -Nur alsa-tools-1.0.16-old/usx2yloader/Makefile.in alsa-tools-1.0.16/usx2yloader/Makefile.in
---- alsa-tools-1.0.16-old/usx2yloader/Makefile.in	2008-04-08 16:39:28.000000000 +0300
-+++ alsa-tools-1.0.16/usx2yloader/Makefile.in	2008-04-08 16:42:37.000000000 +0300
+diff -Naur alsa-tools-1.0.18/usx2yloader/Makefile.in alsa-tools-1.0.18-patched/usx2yloader/Makefile.in
+--- alsa-tools-1.0.18/usx2yloader/Makefile.in	2008-10-29 14:49:27.000000000 +0200
++++ alsa-tools-1.0.18-patched/usx2yloader/Makefile.in	2008-10-31 15:14:47.000000000 +0200
 @@ -166,8 +166,8 @@
  AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware/$(MYNAME)\"
  usx2yloader_SOURCES = usx2yloader.c
- EXTRA_DIST = depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
+ EXTRA_DIST = gitcompile depcomp tascam_fw.usermap tascam_fw.in tascam_fpga.in
 -hotplug_files = tascam_fw.usermap tascam_fw tascam_fpga
 -hotplugdir = /etc/hotplug/usb
-+hotplug_files = tascam_fw tascam_fpga
++hotplug_files =  tascam_fw tascam_fpga
 +hotplugdir = /lib/udev
  hotplug_SCRIPTS = $(hotplug_files)
  all: all-am

Modified: 2008/applications/hardware/alsa-tools/pspec.xml
=================================================================
--- 2008/applications/hardware/alsa-tools/pspec.xml	(original)
+++ 2008/applications/hardware/alsa-tools/pspec.xml	Fri Nov 21 14:32:56 2008
@@ -5,44 +5,93 @@
         <Name>alsa-tools</Name>
         <Homepage>http://www.alsa-project.org/</Homepage>
         <Packager>
-            <Name>İsmail Dönmez</Name>
-            <Email>ismail at pardus.org.tr</Email>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
         </Packager>
         <License>GPLv2</License>
         <IsA>app:console</IsA>
+        <IsA>app:gui</IsA>
         <Summary>ALSA tools</Summary>
-        <Description>Contains ALSA (Advanced Linux Sound Architecture) tools.</Description>
-        <Archive sha1sum="a127fcc1ee5d4757b259a50b289db252f2951d7a" type="tarbz2">ftp://ftp.alsa-project.org/pub/tools/alsa-tools-1.0.17.tar.bz2</Archive>
+        <Description>Contains ALSA (Advanced Linux Sound Architecture) tools like firmware loaders and sound card control utilities.</Description>
+        <Archive sha1sum="937e7ccad45b5e1f3f07f7c52f226bbf600690f7" type="tarbz2">ftp://ftp.alsa-project.org/pub/tools/alsa-tools-1.0.18.tar.bz2</Archive>
         <BuildDependencies>
+            <Dependency versionFrom="1.0.18">alsa-lib</Dependency>
             <Dependency>gtk2</Dependency>
-            <Dependency versionFrom="1.0.17">alsa-lib</Dependency>
+            <Dependency>fltk-devel</Dependency>
+            <Dependency>qt</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">usx2yloader_udev.patch</Patch>
+            <Patch level="1">firmware_locations.patch</Patch>
         </Patches>
     </Source>
 
     <Package>
         <Name>alsa-tools</Name>
+        <Summary>ALSA console tools</Summary>
+        <Description>alsa-tools is a collection of console applications for controlling sound cards like EchoAudio, Envy24, etc.</Description>
         <RuntimeDependencies>
-            <Dependency>gtk2</Dependency>
-            <Dependency versionFrom="1.0.17">alsa-lib</Dependency>
+            <Dependency versionFrom="1.0.18">alsa-lib</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="config">/etc</Path>
             <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="executable">/usr/sbin</Path>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib</Path>
-            <Path fileType="executable">/usr/sbin</Path>
+            <Path fileType="data">/lib/udev</Path>
             <Path fileType="data">/usr/share/aclocal</Path>
-            <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="data">/usr/share/ld10k1</Path>
+            <Path fileType="data">/usr/share/sounds</Path>
             <Path fileType="man">/usr/share/man</Path>
-            <Path fileType="data">/lib/udev</Path>
+            <Path fileType="doc">/usr/share/doc/alsa-tools-1.0.18-9</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>alsa-tools-gui</Name>
+        <Summary>Graphical frontends for some ALSA tools</Summary>
+        <Description>alsa-tools-gui is a collection of GUI based ALSA tools for controlling sound cards like EchoAudio, Envy24, Hammerfall HDSP, RMedigicontrol.</Description>
+        <RuntimeDependencies>
+            <Dependency versionFrom="1.0.18">alsa-lib</Dependency>
+            <Dependency>gtk2</Dependency>
+            <Dependency>fltk</Dependency>
+            <Dependency>qt</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="man">/usr/share/man/man1/envy24control.1</Path>
+            <Path fileType="doc">/usr/share/doc/alsa-tools-gui-1.0.18-9</Path>
+            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/pixmaps</Path>
+            <Path fileType="executable">/usr/bin/echomixer</Path>
+            <Path fileType="executable">/usr/bin/envy24control</Path>
+            <Path fileType="executable">/usr/bin/hdspconf</Path>
+            <Path fileType="executable">/usr/bin/hdspmixer</Path>
+            <Path fileType="executable">/usr/bin/rmedigicontrol</Path>
+            <Path fileType="executable">/usr/bin/qlo10k1</Path>
         </Files>
+        <AdditionalFiles>
+            <AdditionalFile target="/usr/share/pixmaps/alsa-tools.xpm" permission="0644">alsa-tools.xpm</AdditionalFile>
+            <AdditionalFile target="/usr/share/applications/echomixer.desktop" permission="0644">echomixer.desktop</AdditionalFile>
+            <AdditionalFile target="/usr/share/applications/envy24control.desktop" permission="0644">envy24control.desktop</AdditionalFile>
+            <AdditionalFile target="/usr/share/applications/hdspmixer.desktop" permission="0644">hdspmixer.desktop</AdditionalFile>
+            <AdditionalFile target="/usr/share/applications/hdspconf.desktop" permission="0644">hdspconf.desktop</AdditionalFile>
+            <AdditionalFile target="/usr/share/applications/rmedigicontrol.desktop" permission="0644">rmedigicontrol.desktop</AdditionalFile>
+        </AdditionalFiles>
     </Package>
 
     <History>
+        <Update release="9">
+            <Date>2008-10-31</Date>
+            <Version>1.0.18</Version>
+            <Comment>
+                - Version bump to the latest stable 1.0.18,
+                - Add firmware_locations.patch for installing firmwares into /lib/firmware,
+                - Split the package for separating GUI and console tools,
+                - Take over package.
+            </Comment>
+            <Name>Ozan Çağlayan</Name>
+            <Email>ozan at pardus.org.tr</Email>
+        </Update>
         <Update release="8">
             <Date>2008-07-15</Date>
             <Version>1.0.17</Version>


Paketler-commits mesaj listesiyle ilgili daha fazla bilgi