(temporarily?) remove gold patch from ubuntu

diff --git a/debian/changelog b/debian/changelog
index 283a7b5..b7e6447 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,9 +12,6 @@ ckermit (300-1) unstable; urgency=low
     + socks support causes problems with avahi.
     + you can get the same functionality with 'tsocks kermit'.
   * Removed all patches from debian/patches, all taken upstream.
-  * Added patch 010_fix_ftbfs_binutils-gold from ubuntu (Closes: #617529).
-    Moved LNKFLAGS to the end to fix FTBFS with gold (LP: #732064).
-    Thanks to Tarun Kumar Mall <c2tarun@gmail.com>.
   * debian/rules: use dh minimal rules file.
   * Bump debhelper build depends to (>= 7.0.50~) for dh override support.
   * Update PAM config, now just includes common-auth, common-account
@@ -29,7 +26,7 @@ ckermit (300-1) unstable; urgency=low
     + Standards-Version: 3.9.2 (no changes).
   * Remove XS-Autobuild: yes; not needed now we are in main.
 
- -- Ian Beckwith <ianb@debian.org>  Sun, 10 Jul 2011 16:15:54 +0100
+ -- Ian Beckwith <ianb@debian.org>  Sun, 10 Jul 2011 19:54:11 +0100
 
 ckermit (211-15) unstable; urgency=low
 

diff --git a/debian/patches/010_fix_ftbfs_binutils-gold.patch b/debian/patches/010_fix_ftbfs_binutils-gold.patch
deleted file mode 100644 (file)
index a7da446..0000000
--- a/debian/patches/010_fix_ftbfs_binutils-gold.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: ckermit/makefile
-===================================================================
---- ckermit.orig/makefile      2011-07-10 16:09:55.000000000 +0100
-+++ ckermit/makefile   2011-07-10 16:10:00.000000000 +0100
-@@ -1270,7 +1270,7 @@
-               ckuscr.$(EXT) ckcnet.$(EXT) ckctel.$(EXT) ckusig.$(EXT) \
-               ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) ckuath.$(EXT) \
-               ck_crp.$(EXT) ck_ssl.$(EXT)
--      $(CC2) $(LNKFLAGS) -o wermit \
-+      $(CC2) -o wermit \
-               ckcmai.$(EXT) ckclib.$(EXT) ckutio.$(EXT) ckufio.$(EXT) \
-               ckcfns.$(EXT) ckcfn2.$(EXT) ckcfn3.$(EXT) ckuxla.$(EXT) \
-               ckcpro.$(EXT) ckucmd.$(EXT) ckuus2.$(EXT) ckuus3.$(EXT) \
-@@ -1278,7 +1278,7 @@
-               ckuusx.$(EXT) ckuusy.$(EXT) ckuusr.$(EXT) ckucns.$(EXT) \
-               ckudia.$(EXT) ckuscr.$(EXT) ckcnet.$(EXT) ckusig.$(EXT) \
-               ckctel.$(EXT) ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) \
--              ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS)
-+              ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS) $(LNKFLAGS)
- 
- # Malloc Debugging version
- 

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644 (file)
index 55ff80d..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-010_fix_ftbfs_binutils-gold.patch

diff --git a/makefile b/makefile
index 0165d38..176bc4e 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1270,7 +1270,7 @@ xermit:   ckcmai.$(EXT) ckclib.$(EXT) ckucmd.$(EXT) ckuusr.$(EXT) ckuus2.$(EXT) \
                ckuscr.$(EXT) ckcnet.$(EXT) ckctel.$(EXT) ckusig.$(EXT) \
                ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) ckuath.$(EXT) \
                ck_crp.$(EXT) ck_ssl.$(EXT)
-       $(CC2) -o wermit \
+       $(CC2) $(LNKFLAGS) -o wermit \
                ckcmai.$(EXT) ckclib.$(EXT) ckutio.$(EXT) ckufio.$(EXT) \
                ckcfns.$(EXT) ckcfn2.$(EXT) ckcfn3.$(EXT) ckuxla.$(EXT) \
                ckcpro.$(EXT) ckucmd.$(EXT) ckuus2.$(EXT) ckuus3.$(EXT) \
@@ -1278,7 +1278,7 @@ xermit:   ckcmai.$(EXT) ckclib.$(EXT) ckucmd.$(EXT) ckuusr.$(EXT) ckuus2.$(EXT) \
                ckuusx.$(EXT) ckuusy.$(EXT) ckuusr.$(EXT) ckucns.$(EXT) \
                ckudia.$(EXT) ckuscr.$(EXT) ckcnet.$(EXT) ckusig.$(EXT) \
                ckctel.$(EXT) ckcuni.$(EXT) ckupty.$(EXT) ckcftp.$(EXT) \
-               ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS) $(LNKFLAGS)
+               ckuath.$(EXT) ck_crp.$(EXT) ck_ssl.$(EXT) $(LIBS)
 
 # Malloc Debugging version