[SCM] Packaging for openal-soft branch, master, updated. debian/1.7.411-3-13-g27e5bac

[Andres Mejia]

The following commit has been merged in the master branch:
commit 9e62ec926e8d573a9929cc3fe20d38b78c93beaa
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Jun 9 19:36:16 2009 -0400

    Removing current patches as they've been applied upstream.

diff --git a/debian/patches/alsoftrc-fix.patch b/debian/patches/alsoftrc-fix.patch
deleted file mode 100644
index 27df9aa..0000000
--- a/debian/patches/alsoftrc-fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Comment out all non-option lines.
-==========================================================================
---- a/alsoftrc.sample
-+++ b/alsoftrc.sample
-@@ -68,38 +68,38 @@
-              # Default is empty (all available effects enabled)
- 
- layout_STEREO =  # Sets the speaker layout when using stereo output. Values are
--                   specified in degrees, where 0 is straight in front, negative
--                   goes left, and positive goes right. The values must define a
--                   circular pattern, starting with the back-left at the most
--                   negative, around the front to back-center. Unspecified
--                   speakers will remain at their default position. Available
--                   speakers are front-left(fl) and front-right(fr).
--                   The default is:
-+                 # specified in degrees, where 0 is straight in front, negative
-+                 # goes left, and positive goes right. The values must define a
-+                 # circular pattern, starting with the back-left at the most
-+                 # negative, around the front to back-center. Unspecified
-+                 # speakers will remain at their default position. Available
-+                 # speakers are front-left(fl) and front-right(fr).
-+                 # The default is:
-                    fl=-90, fr=90
- 
- layout_QUAD =  # Sets the speaker layout when using quadriphonic output.
--                 Available speakers are back-left(bl), front-left(fl),
--                 front-right(fr), and back-right(br).
--                 The default is:
-+               # Available speakers are back-left(bl), front-left(fl),
-+               # front-right(fr), and back-right(br).
-+               # The default is:
-                  bl=-135, fl=-45, fr=45, br=135
- 
- layout_51CHN =  # Sets the speaker layout when using 5.1 output. Available
--                  speakers are back-left(bl), front-left(fl), front-center(fc),
--                  front-right(fr), and back-right(br).
--                  The default is:
-+                # speakers are back-left(bl), front-left(fl), front-center(fc),
-+                # front-right(fr), and back-right(br).
-+                # The default is:
-                   bl=-110, fl=-30, fc=0, fr=30, br=110
- 
- layout_61CHN =  # Sets the speaker layout when using 6.1 output. Available
--                  speakers are side-left(sl), front-left(fl), front-center(fc),
--                  front-right(fr), side-right(sr), and back-center(bc).
--                  The default is:
-+                # speakers are side-left(sl), front-left(fl), front-center(fc),
-+                # front-right(fr), side-right(sr), and back-center(bc).
-+                # The default is:
-                   sl=-90, fl=-30, fc=0, fr=30, sr=90, bc=180
- 
- layout_71CHN =  # Sets the speaker layout when using 7.1 output. Available
--                  speakers are back-left(bl), side-left(sl), front-left(fl),
--                  front-center(fc), front-right(fr), side-right(sr), and
--                  back-right(br).
--                  The default is:
-+                # speakers are back-left(bl), side-left(sl), front-left(fl),
-+                # front-center(fc), front-right(fr), side-right(sr), and
-+                # back-right(br).
-+                # The default is:
-                   bl=-150, sl=-90, fl=-30, fc=0, fr=30, sr=90 br=150
- 
- 
diff --git a/debian/patches/install-alsoft.conf.patch b/debian/patches/install-alsoft.conf.patch
deleted file mode 100644
index c15647c..0000000
--- a/debian/patches/install-alsoft.conf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch to optionally install alsoft.conf file
-==========================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,6 +34,8 @@
- 
- OPTION(EXAMPLES  "Build example programs"              ON)
- 
-+OPTION(ALSOFT_CONFIG "Install alsoft.conf configuration file" OFF)
-+
- 
- IF(WIN32)
-     SET(LIBNAME OpenAL32)
-@@ -389,6 +391,13 @@
- INSTALL(FILES "${OpenAL_BINARY_DIR}/admin/pkgconfig/openal.pc"
-         DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
- 
-+# Install alsoft.conf configuration file
-+IF(ALSOFT_CONFIG)
-+    INSTALL(FILES alsoftrc.sample DESTINATION /etc/openal
-+        RENAME alsoft.conf
-+    )
-+ENDIF()
-+
- IF(EXAMPLES)
-     ADD_EXECUTABLE(openal-info examples/openal-info.c)
-     TARGET_LINK_LIBRARIES(openal-info ${LIBNAME})
diff --git a/debian/patches/series b/debian/patches/series
index 1c81146..cafd205 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-install-alsoft.conf.patch
-alsoftrc-fix.patch
+# Nothing to patch

-- 
Packaging for openal-soft