From 74cd36bb1e753c42dcc7e0a14b7c86c25afd8db3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 7 Dec 2011 18:10:51 -0600
Subject: Merge patches for libart static to source repository

---
 .../debian/patches/60_libart-config-static.patch   | 38 ----------------------
 .../debian/patches/60_libart-config-static.patch   | 38 ----------------------
 2 files changed, 76 deletions(-)
 delete mode 100644 debian/lenny/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch
 delete mode 100644 debian/squeeze/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch

(limited to 'debian')

diff --git a/debian/lenny/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch b/debian/lenny/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch
deleted file mode 100644
index dd4fc8c2e..000000000
--- a/debian/lenny/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Add --static support to libart2-config --libs to avoid -lm
-Debian #375812, GNOME #531278
-
-Index: libart-config.in
-===================================================================
---- libart-config.in (revision 280)
-+++ libart-config.in (working copy)
-@@ -3,6 +3,8 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
-+libs=""
-+output_libs=no
- 
- usage="\
- Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
-@@ -43,8 +45,11 @@ while test $# -gt 0; do
-       echo $includes
-       ;;
-     --libs)
--      libdirs=-L@libdir@
--      echo $libdirs -lart_lgpl_2 -lm
-+      libs="$libs -L@libdir@ -lart_lgpl_2"
-+      output_libs=yes
-+      ;;
-+    --static)
-+      libs="$libs -lm"
-       ;;
-     *)
-       echo "${usage}" 1>&2
-@@ -54,3 +59,7 @@ while test $# -gt 0; do
-   shift
- done
- 
-+if test $output_libs = yes ; then
-+    echo $libs
-+fi
-+
diff --git a/debian/squeeze/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch b/debian/squeeze/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch
deleted file mode 100644
index dd4fc8c2e..000000000
--- a/debian/squeeze/dependencies/libart-lgpl/debian/patches/60_libart-config-static.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Add --static support to libart2-config --libs to avoid -lm
-Debian #375812, GNOME #531278
-
-Index: libart-config.in
-===================================================================
---- libart-config.in (revision 280)
-+++ libart-config.in (working copy)
-@@ -3,6 +3,8 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- exec_prefix_set=no
-+libs=""
-+output_libs=no
- 
- usage="\
- Usage: libart-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
-@@ -43,8 +45,11 @@ while test $# -gt 0; do
-       echo $includes
-       ;;
-     --libs)
--      libdirs=-L@libdir@
--      echo $libdirs -lart_lgpl_2 -lm
-+      libs="$libs -L@libdir@ -lart_lgpl_2"
-+      output_libs=yes
-+      ;;
-+    --static)
-+      libs="$libs -lm"
-       ;;
-     *)
-       echo "${usage}" 1>&2
-@@ -54,3 +59,7 @@ while test $# -gt 0; do
-   shift
- done
- 
-+if test $output_libs = yes ; then
-+    echo $libs
-+fi
-+
-- 
cgit v1.2.1