[SCM] Packaging for openal-soft branch, master, updated. debian/1.7.411-2-6-g656063c

Andres Mejia mcitadel at gmail.com
Sat May 16 21:14:52 UTC 2009


The following commit has been merged in the master branch:
commit d0674d87e16caa7dbc15d4d15f401147b850d560
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 16 17:04:32 2009 -0400

    Switch ordering patches are installed.
    Patches that should be submitted upstream should be applied first.
    Patches that are Debian specific should be applied last.

diff --git a/debian/patches/install-alsoft.conf.patch b/debian/patches/install-alsoft.conf.patch
index 325c8ed..c15647c 100644
--- a/debian/patches/install-alsoft.conf.patch
+++ b/debian/patches/install-alsoft.conf.patch
@@ -2,7 +2,7 @@ Patch to optionally install alsoft.conf file
 ==========================================================================
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -37,6 +37,8 @@
+@@ -34,6 +34,8 @@
  
  OPTION(EXAMPLES  "Build example programs"              ON)
  
@@ -11,7 +11,7 @@ Patch to optionally install alsoft.conf file
  
  IF(WIN32)
      SET(LIBNAME OpenAL32)
-@@ -407,6 +409,13 @@
+@@ -389,6 +391,13 @@
  INSTALL(FILES "${OpenAL_BINARY_DIR}/admin/pkgconfig/openal.pc"
          DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
  
diff --git a/debian/patches/series b/debian/patches/series
index f01c0fc..8648f0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-static_lib.patch
-alsoftrc-fix.patch
 install-alsoft.conf.patch
+alsoftrc-fix.patch
+static_lib.patch
diff --git a/debian/patches/static_lib.patch b/debian/patches/static_lib.patch
index 1d845a0..ef9b0aa 100644
--- a/debian/patches/static_lib.patch
+++ b/debian/patches/static_lib.patch
@@ -12,7 +12,7 @@ Support building of static libraries
  
  OPTION(ALSA    "Check for ALSA backend"                ON)
  OPTION(OSS     "Check for OSS backend"                 ON)
-@@ -375,6 +378,21 @@
+@@ -377,6 +380,21 @@
  
  TARGET_LINK_LIBRARIES(${LIBNAME} ${EXTRA_LIBS})
  

-- 
Packaging for openal-soft



More information about the Pkg-games-commits mailing list