tizen 2.3 release

diff --git a/alsa-utils.manifest b/alsa-utils.manifest
index 932f74b..79d7233 100755 (executable)
--- a/alsa-utils.manifest
+++ b/alsa-utils.manifest
@@ -3,14 +3,14 @@
                <domain name="_" />
        </request>
        <assign>
-           <filesystem path="/opt/usr/devel/usr/bin/alsaloop" label="_" exec_label="none"/>
-           <filesystem path="/opt/usr/devel/usr/bin/alsaucm" label="_" exec_label="none"/>
-           <filesystem path="/opt/usr/devel/usr/bin/amixer" label="_" exec_label="none"/>
-           <filesystem path="/opt/usr/devel/usr/bin/aplay" label="_" exec_label="none"/>
-           <filesystem path="/opt/usr/devel/usr/bin/iecset" label="_" exec_label="none"/>
-           <filesystem path="/opt/usr/devel/usr/bin/speaker-test" label="_" exec_label="none"/>
-           <filesystem path="/opt/usr/devel/usr/sbin/alsaconf" label="_" exec_label="none"/>
-           <filesystem path="/opt/usr/devel/usr/sbin/alsactl" label="_" exec_label="none"/>
+           <filesystem path="/usr/bin/alsaloop" label="_" exec_label="none"/>
+           <filesystem path="/usr/bin/alsaucm" label="_" exec_label="none"/>
+           <filesystem path="/usr/bin/amixer" label="_" exec_label="none"/>
+           <filesystem path="/usr/bin/aplay" label="_" exec_label="none"/>
+           <filesystem path="/usr/bin/iecset" label="_" exec_label="none"/>
+           <filesystem path="/usr/bin/speaker-test" label="_" exec_label="none"/>
+           <filesystem path="/usr/sbin/alsaconf" label="_" exec_label="none"/>
+           <filesystem path="/usr/sbin/alsactl" label="_" exec_label="none"/>
        </assign>
 </manifest>
 

diff --git a/debian/alsa-utils.install b/debian/alsa-utils.install
deleted file mode 100644 (file)
index 862779b..0000000
--- a/debian/alsa-utils.install
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/bin/*
-/usr/sbin/*
-/usr/share/alsa/*
-/usr/share/sounds/*

diff --git a/debian/alsa-utils.install.in b/debian/alsa-utils.install.in
deleted file mode 100644 (file)
index 87aa6ef..0000000
--- a/debian/alsa-utils.install.in
+++ /dev/null
@@ -1,4 +0,0 @@
-@PREFIX@/bin/*
-@PREFIX@/sbin/*
-@PREFIX@/share/alsa/*
-@PREFIX@/share/sounds/*

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100755 (executable)
index 6f2a242..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,73 +0,0 @@
-alsa-utils (1.0.24.2-0) unstable; urgency=low
-
-  * Version upgrade from 1.0.21 to 1.0.24.2
-  * Git: pkgs/a/alsa-utils
-  * Tag: alsa-utils_1.0.24.2-0 
-
- -- Seungbae Shin <seungbae.shin@samsung.com>  Tue, 03 Jan 2012 14:07:28 +0900
-
-alsa-utils (1.0.21-1slp2) unstable; urgency=low
-
-  * remove man page in binary package
-  * Git: 165.213.180.234:/git/slp/pkgs/alsa-utils
-  * Tag: alsa-utils_1.0.21-1slp2
-
- -- KwangHui Cho <kwanghui.cho@samsung.com>  Fri, 12 Nov 2010 15:12:28 +0900
- 
-alsa-utils (1.0.21-0slp4) unstable; urgency=low
-
-  * Update for git repository changes
-  * Git: 165.213.180.234:/git/slp/pkgs/alsa-utils
-  * Tag: alsa-utils_1.0.21-0slp4
-
- -- Seungbae Shin <seungbae.shin@samsung.com>  Fri, 12 Nov 2010 11:54:04 +0900
-
-alsa-utils (1.0.21-0slp3) unstable; urgency=low
-
-  * Change maintainer
-  * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/alsa-utils-1.0.16
-  * Tag: alsa-utils_1.0.21-0slp3
-
- -- Seungbae Shin <seungbae.shin@samsung.com>  Thu, 08 Jul 2010 14:49:19 +0900
-
-alsa-utils (1.0.21-0slp2) unstable; urgency=low
-
-  * import alsa utils 1.0.21 to slp2
-
- -- KwangHui Cho <kwanghui.cho@samsung.com>  Tue, 06 Apr 2010 13:40:32 +0900
-
-alsa-utils (1.0.16-4slp2) unstable; urgency=low
-
-  * Change package naming rule
-
- -- Seungbae Shin <seungbae.shin@samsung.com>  Thu, 25 Mar 2010 14:54:29 +0900
-
-alsa-utils (1.0.16-4) unstable; urgency=low
-
-  * Modified configure option in rules file.
-
- -- Yunchan Cho <yunchan.cho@samsung.com>  Thu, 04 Mar 2010 12:20:43 +0900
-
-alsa-utils (1.0.16-3) unstable; urgency=low
-
-  * remove .git directory
-
- -- Yunchan Cho <yunchan.cho@samsung.com>  Fri, 20 Nov 2009 16:17:19 +0900
-
-alsa-utils (1.0.16-2) unstable; urgency=low
-
-  * update debianize
-
- -- Yunchan Cho <yunchan.cho@samsung.com>  Thu, 19 Nov 2009 17:15:35 +0900
-
-alsa-utils (1.0.16-1) unstable; urgency=low
-
-  * uncommnet dh_makeshlibs
-
- -- Yunchan Cho <yunchan.cho@samsung.com>  Mon, 16 Nov 2009 22:25:32 +0900
-
-alsa-utils (1.0.16-0) unstable; urgency=low
-
-  * Initial Release.
-
- -- Yunchan Cho <yunchan.cho@samsung.com>  Thu, 12 Nov 2009 20:12:25 +0900

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index c6163a5..0000000
--- a/debian/control
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: alsa-utils
-Priority: optional
-Maintainer: Seungbae Shin <seungbae.shin@samsung.com>, JongHyuk Choi <jhchoi.choi@samsung.com>
-Uploaders: Seungbae Shin <seungbae.shin@samsung.com>
-Build-Depends: debhelper (>= 5), autotools-dev, libasound2-dev
-Standards-Version: 3.7.2
-Section: libs
-
-Package: alsa-utils
-Section: utils
-Architecture: any 
-Depends: ${shlibs:Depends}, libasound2
-Description: ALSA utility package for multimedia framework middleware package

diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index eb0a817..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
-Copyright (c) 2011 Seongho Jeong <sh33.jeong@samsung.com>
- 
-and is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License version 2.1.

diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index ca882bb..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin

diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index 724e084..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-README
-TODO

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index 6abcf59..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS ?= -Wall -g
-LDFLAGS ?= -L/usr/lib
-PREFIX ?= /usr
-DATADIR ?= /opt
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-config.status: configure
-       dh_testdir
-       # Add here commands to configure the package.
-       ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" --disable-nls --disable-xmlto --disable-alsamixer --disable-alsatest
-
-
-build: build-stamp
-
-build-stamp:  config.status
-       dh_testdir
-
-       # Add here commands to compile the package.
-       $(MAKE)
-       #docbook-to-man debian/ncurses.sgml > ncurses.1
-
-       for f in `find $(CURDIR)/debian/ -name "*.in"`; do \
-               cat $$f > $${f%.in}; \
-               sed -i -e "s#@PREFIX@#$(PREFIX)#g" $${f%.in}; \
-               sed -i -e "s#@DATADIR@#$(DATADIR)#g" $${f%.in}; \
-       done
-
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-       cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-       cp -f /usr/share/misc/config.guess config.guess
-endif
-
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/ncurses.
-       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_install --sourcedir=debian/tmp
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_python
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

diff --git a/packaging/alsa-utils.spec b/packaging/alsa-utils.spec
index b771537..4164615 100644 (file)
--- a/packaging/alsa-utils.spec
+++ b/packaging/alsa-utils.spec
@@ -2,13 +2,13 @@
 
 Name:       alsa-utils
 Summary:    Advanced Linux Sound Architecture (ALSA) utilities
-Version:    1.0.24.3
-Release:    0
+Version:    1.0.24.4
+Release:    4
 Group:      Applications/Multimedia
 License:    GPLv2+
 URL:        http://www.alsa-project.org/
 Source0:    ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}.tar.gz
-BuildRequires:  libasound-devel
+BuildRequires: pkgconfig(alsa)
 
 
 %description
@@ -38,7 +38,6 @@ Man pages for alsa-utils
     --disable-xmlto \
     --disable-alsamixer \
     --disable-alsatest \
-    --disable-alsaconf \
     --with-udev-rules-dir=/usr/lib/udev/rules.d
 
 make %{?jobs:-j%jobs}
@@ -48,26 +47,17 @@ exit
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
-mkdir -p %{buildroot}/opt/usr/devel/usr/bin
-mkdir -p %{buildroot}/opt/usr/devel/usr/sbin
 cp COPYING %{buildroot}/usr/share/license/%{name}
 
 %make_install
 
-mv %{buildroot}/usr/bin/* %{buildroot}/opt/usr/devel/usr/bin
-mv %{buildroot}/usr/sbin/* %{buildroot}/opt/usr/devel/usr/sbin
-
 %remove_docs
 
 %files
 %manifest alsa-utils.manifest
-/opt/usr/devel/usr/bin/*
-/opt/usr/devel/usr/sbin/*
+%{_bindir}/*
+%{_sbindir}/*
 %{_datadir}/alsa/*
-%ifarch %{arm}
 %{_datadir}/sounds/*
-%else
-%exclude %{_datadir}/sounds/*
-%endif
 /usr/lib/udev/rules.d/90-alsa-restore.rules
 /usr/share/license/%{name}