[libx11-guitest-perl] 04/06: Drop patches, all applied upstream

Florian Schlichting fsfs at moszumanska.debian.org
Fri Apr 11 19:50:32 UTC 2014


This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository libx11-guitest-perl.

commit e1be75c1bd54e359ffe5f49be589f8d3558e6b6e
Author: Florian Schlichting <fsfs at debian.org>
Date:   Fri Apr 11 21:41:44 2014 +0200

    Drop patches, all applied upstream
---
 debian/patches/01-fix-spelling-error.diff          | 16 -------------
 debian/patches/ccflags.patch                       | 27 ----------------------
 debian/patches/series                              |  3 ---
 debian/patches/useless-dependency-on-libXext.patch | 18 ---------------
 4 files changed, 64 deletions(-)

diff --git a/debian/patches/01-fix-spelling-error.diff b/debian/patches/01-fix-spelling-error.diff
deleted file mode 100644
index 34a61c2..0000000
--- a/debian/patches/01-fix-spelling-error.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix spelling error
-Author: Fabrizio Regalli <fabreg at fabreg.it>
-Last-Update: 2011-07-26
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=88194
-
---- a/GUITest.pm
-+++ b/GUITest.pm
-@@ -973,7 +973,7 @@
- Braces are used to quote special characters, for utilizing aliased key
- names, or for special functionality. Multiple characters can be specified
- in a brace by space delimiting the entries.  Characters can be repeated using
--a number that is space delimited after the preceeding key.
-+a number that is space delimited after the preceding key.
- 
- Quote Special Characters
- 
diff --git a/debian/patches/ccflags.patch b/debian/patches/ccflags.patch
deleted file mode 100644
index d342afe..0000000
--- a/debian/patches/ccflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Include $Config{ccflags} in CCFLAGS
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/651876
-Forwarded: not-needed
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-12-13
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -4,7 +4,7 @@
- use strict;
- use warnings;
- use ExtUtils::MakeMaker;
--
-+use Config;
- 
- # Optional building of additional doc formats.
- if (defined($ARGV[0]) && $ARGV[0] eq 'docs') {
-@@ -30,7 +30,7 @@
- 	# (X server) extensions, use "-DX11_GUITEST_USING_XINERAMA".
- 	'DEFINE' => '-DNDEBUG -DX11_GUITEST_ALT_L_FALLBACK_META_L', # e.g., '-DHAVE_SOMETHING'
- 	'INC'   => '-I/usr/X11R6/include -I/usr/X/include', # e.g., '-I/usr/include/other'
--	'CCFLAGS' => '-Wall',
-+	'CCFLAGS' => "-Wall $Config{ccflags}",
- 	'OBJECT' => 'GUITest$(OBJ_EXT) KeyUtil$(OBJ_EXT)',
- 	'OPTIMIZE' => '-O2',
-         'META_MERGE' => {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b088e2f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-01-fix-spelling-error.diff
-useless-dependency-on-libXext.patch
-ccflags.patch
diff --git a/debian/patches/useless-dependency-on-libXext.patch b/debian/patches/useless-dependency-on-libXext.patch
deleted file mode 100644
index 007fa9b..0000000
--- a/debian/patches/useless-dependency-on-libXext.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: do not link against libXext, we use none of its symbols
-Author: Florian Schlichting <fsfs at debian.org>
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=88194
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -46,9 +46,9 @@
- 	my $un = `uname -a 2>&1` || "";
- 	if ($un =~ /x86_64|amd64/i && $un !~ /OpenBSD/) {
- 		# In case of x64, lets make sure we use x64 libs, system might have both.
--		return ['-L/usr/X11R6/lib64 -L/usr/X/lib64 -lXtst -lXext -lX11'];
-+		return ['-L/usr/X11R6/lib64 -L/usr/X/lib64 -lXtst -lX11'];
- 	} else {
--		return ['-L/usr/X11R6/lib -L/usr/X/lib -lXtst -lXext -lX11'];
-+		return ['-L/usr/X11R6/lib -L/usr/X/lib -lXtst -lX11'];
- 	}
- }
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libx11-guitest-perl.git



More information about the Pkg-perl-cvs-commits mailing list