From: Marius Gavrilescu <marius@ieval.ro>
Date: Fri, 9 Aug 2013 13:22:00 +0000 (+0300)
Subject: Remove patches
X-Git-Tag: debian/2.5-1~2
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=fa01c982a1ebc18316316b46739ea790d26c620b;p=xfishtank.git

Remove patches
---

diff --git a/debian/patches/do-not-assume-environment-contains-display.patch b/debian/patches/do-not-assume-environment-contains-display.patch
deleted file mode 100644
index 904538b..0000000
--- a/debian/patches/do-not-assume-environment-contains-display.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Do not assume that the environment contains a DISPLAY variable
- Previously, the code unconditionally tried to copy it to a variable.
- This segfaults when that variable does not exist.
-Author: Marius Gavrilescu <marius@ieval.ro>
-Bug-Debian: http://bugs.debian.org/716500
-Forwarded: https://github.com/jim-rees/xfishtank/issues/5
-Bug: https://github.com/jim-rees/xfishtank/issues/5
-Last-Update: 2013-07-11
-
---- xfishtank-2.3.orig/xfish.c
-+++ xfishtank-2.3/xfish.c
-@@ -171,12 +171,14 @@ int argc;
- char **argv;
- {
-     int c, i;
-+    const char *display = getenv("DISPLAY");
-     extern int optind;
-     extern char *optarg;
-     extern double atof();
- 
-     pname = argv[0];
--    strncpy(sname, getenv("DISPLAY"), sizeof(sname) - 1);
-+    if(display != NULL)
-+    strncpy(sname, display, sizeof(sname) - 1);
-     strcpy(cname, "MediumAquamarine");
- 
-     while ((c = getopt(argc, argv, "dDob:C:c:p:m:f:i:r:s")) != EOF) {
diff --git a/debian/patches/fix-manpage.patch b/debian/patches/fix-manpage.patch
deleted file mode 100644
index 8493629..0000000
--- a/debian/patches/fix-manpage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Change hypens to minus signs and section to 1x
-Author: Marius Gavrilescu <marius@ieval.ro>
-Forwarded: https://github.com/jim-rees/xfishtank/issues/4
-Last-Update: 2013-07-10
-
---- a/xfishtank.1x
-+++ b/xfishtank.1x
-@@ -24,13 +24,13 @@
- .\" but WITHOUT ANY WARRANTY; without even the implied warranty of
- .\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- .\"
--.TH XFISHTANK 1 "29 November 1996" "V2.2"
-+.TH XFISHTANK 1x "29 November 1996" "V2.2"
- .SH NAME
- xfishtank \- Fish swimming across your Root Window
- .SH SYNOPSIS
- .B xfishtank
--[-c <color>] [-b <limit>] [-f <limit>] [-i <mult>] [-r <rate>] [-m <num>]
--[-C <num>] [-d] [-p <file>] [host:display]
-+[\-c <color>] [\-b <limit>] [\-f <limit>] [\-i <mult>] [\-r <rate>] [\-m <num>]
-+[\-C <num>] [\-d] [\-p <file>] [host:display]
- .SH DESCRIPTION
- .LP
- xfishtank is a animation program to simulate an Aquarium on your X desktop.
diff --git a/debian/patches/remove-p-argument-from-manpage.patch b/debian/patches/remove-p-argument-from-manpage.patch
deleted file mode 100644
index 5cf92b4..0000000
--- a/debian/patches/remove-p-argument-from-manpage.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Remove the -p parameter from the manpage
-Author: Marius Gavrilescu <marius@ieval.ro>
-Forwarded: not-needed
-Last-Update: 2013-07-10
-
---- a/xfishtank.1x
-+++ b/xfishtank.1x
-@@ -30,7 +30,7 @@
- .SH SYNOPSIS
- .B xfishtank
- [\-c <color>] [\-b <limit>] [\-f <limit>] [\-i <mult>] [\-r <rate>] [\-m <num>]
--[\-C <num>] [\-d] [\-p <file>] [host:display]
-+[\-C <num>] [\-d] [host:display]
- .SH DESCRIPTION
- .LP
- xfishtank is a animation program to simulate an Aquarium on your X desktop.
-@@ -67,9 +67,6 @@
- .B \-d
- Clip fish, swim on root window
- .TP 8
--.B \-p \fIfile\fP
--Fish swim on picture in file
--.TP 8
- .B \-\fIhost\fP:\fIdpy\fP
- This option specifies the X server to contact.
- .SH SEE ALSO
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index eb8698d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fix-manpage.patch
-remove-p-argument-from-manpage.patch
-do-not-assume-environment-contains-display.patch