[Pkg-xfce-commits] r5096 - in goodies/branches/experimental/ristretto/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-03 07:44:59 +0000 (Thu, 03 Mar 2011)
New Revision: 5096

Removed:
   goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch
   goodies/branches/experimental/ristretto/debian/patches/series
Modified:
   goodies/branches/experimental/ristretto/debian/changelog
Log:
* debian/patches:
  - 01_fix-implicit-dso-linking dropped, included upstream.

Modified: goodies/branches/experimental/ristretto/debian/changelog
===================================================================
--- goodies/branches/experimental/ristretto/debian/changelog	2011-03-03 07:44:12 UTC (rev 5095)
+++ goodies/branches/experimental/ristretto/debian/changelog	2011-03-03 07:44:59 UTC (rev 5096)
@@ -1,8 +1,10 @@
 ristretto (0.0.93-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - 01_fix-implicit-dso-linking dropped, included upstream.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 03 Mar 2011 08:43:42 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 03 Mar 2011 08:44:41 +0100
 
 ristretto (0.0.91-2) experimental; urgency=low
 

Deleted: goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch
===================================================================
--- goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch	2011-03-03 07:44:12 UTC (rev 5095)
+++ goodies/branches/experimental/ristretto/debian/patches/01_fix-implicit-dso-linking.patch	2011-03-03 07:44:59 UTC (rev 5096)
@@ -1,33 +0,0 @@
-From 646e66be08ff98162890de9ed184393f4be6bd13 Mon Sep 17 00:00:00 2001
-From: Stephan Arts <stephan at xfce.org>
-Date: Tue, 13 Jul 2010 16:58:44 +0000
-Subject: Fix build with --no-add-needed
-
-Add -lX11 to LDADD in Makefile.am
----
-The upstream patch as been slightly changed/cleaned:
-  * dropped changes to Changelog;
-  * added changes to Makefile.in to avoid rerunning autotools.
-
---- ristretto-0.0.91.orig/src/Makefile.in
-+++ ristretto-0.0.91/src/Makefile.in
-@@ -278,7 +278,7 @@ ristretto_LDADD = \
- 	$(CAIRO_LIBS) \
- 	$(XFCONF_LIBS) \
- 	$(LIBXFCE4UTIL_LIBS) \
--	$(LIBXFCEGUI4_LIBS)
-+	$(LIBXFCEGUI4_LIBS) -lX11
- 
- INCLUDES = \
- 	-I${top_srcdir}
---- ristretto-0.0.91.orig/src/Makefile.am
-+++ ristretto-0.0.91/src/Makefile.am
-@@ -41,7 +41,7 @@ ristretto_LDADD = \
- 	$(CAIRO_LIBS) \
- 	$(XFCONF_LIBS) \
- 	$(LIBXFCE4UTIL_LIBS) \
--	$(LIBXFCEGUI4_LIBS)
-+	$(LIBXFCEGUI4_LIBS) -lX11
- 
- INCLUDES = \
- 	-I${top_srcdir}

Deleted: goodies/branches/experimental/ristretto/debian/patches/series
===================================================================
--- goodies/branches/experimental/ristretto/debian/patches/series	2011-03-03 07:44:12 UTC (rev 5095)
+++ goodies/branches/experimental/ristretto/debian/patches/series	2011-03-03 07:44:59 UTC (rev 5096)
@@ -1 +0,0 @@
-01_fix-implicit-dso-linking.patch