← Back to branch summary

~ubuntu-branches/ubuntu/quantal/elinks/quantal

« back to all changes in this revision

Viewing changes to debian/patches/08_436817_nostrip.diff

  • Committer: Bazaar Package Importer
  • Author(s): Siegfried-Angel Gevatter Pujals (RainCT)
  • Date: 2008-02-01 16:29:06 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080201162906-xdourui5tyjva0al
Tags: 0.11.3-5ubuntu1
https://launchpad.net/bugs/187936
 
* Merge from Debian unstable (LP: #187936); remaining changes:
  - Add X-Ubuntu-Gettext-Domain to .desktop files.
  - debian/control: Maintainer field update.
* Improve the text in the .desktop file and add some translations.
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/08_436817_nostrip.diff
 
1
Remove CFLAGS from the linker command for dh_strip - comply with Debian
 
2
policy (section 10.1 "Binaries") for #436817
 
3
 
 
4
diff --git a/Makefile.lib b/Makefile.lib
 
5
index b095376..df9e994 100644
 
6
--- a/Makefile.lib
 
7
+++ b/Makefile.lib
 
8
@@ -48,7 +48,7 @@ quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)$@"
 
9
                            `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
 
10
 
 
11
    quiet_cmd_link = '    [$(LINK_COLOR)LINK$(END_COLOR)]   $(RELPATH)$@'
 
12
-         cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
 
13
+         cmd_link = $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
 
14
 
 
15
  quiet_cmd_sparse = '    [SPARSE]   $(RELPATH)$(2)'
 
16
        cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2)