~mozillateam/firefox/firefox-trunk.head

« back to all changes in this revision

Viewing changes to debian/patches/trunk-fsh

  • Committer: Alexander Sack
  • Date: 2007-03-21 17:21:52 UTC
  • Revision ID: asac@jwsdot.com-20070321172152-965dc2b7567eed2f
initial firefox-trunk debian/ package

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
---
 
2
 build/unix/Makefile.in |   10 +++++-----
 
3
 config/autoconf.mk.in  |    8 ++++----
 
4
 2 files changed, 9 insertions(+), 9 deletions(-)
 
5
 
 
6
Index: mozilla/build/unix/Makefile.in
 
7
===================================================================
 
8
--- mozilla.orig/build/unix/Makefile.in 2006-04-28 14:54:52.000000000 +0000
 
9
+++ mozilla/build/unix/Makefile.in      2007-03-20 14:25:01.000000000 +0000
 
10
@@ -67,13 +67,13 @@
 
11
 
 
12
 _DEFS = $(subst \,\\\\\,$(ACDEFINES))
 
13
 
 
14
-pkg_config_files=$(MOZ_APP_NAME)-nspr.pc $(MOZ_APP_NAME)-xpcom.pc \
 
15
-       $(MOZ_APP_NAME)-js.pc \
 
16
-       $(MOZ_APP_NAME)-nss.pc $(MOZ_APP_NAME)-plugin.pc
 
17
+pkg_config_files=$(MOZ_APP_NAME)-trunk-nspr.pc $(MOZ_APP_NAME)-trunk-xpcom.pc \
 
18
+       $(MOZ_APP_NAME)-trunk-js.pc \
 
19
+       $(MOZ_APP_NAME)-trunk-nss.pc $(MOZ_APP_NAME)-trunk-plugin.pc
 
20
 
 
21
-GARBAGE        = $(pkg_config_files) $(MOZ_APP_NAME)-config
 
22
+GARBAGE        = $(pkg_config_files) $(MOZ_APP_NAME)-trunk-config
 
23
 
 
24
-$(MOZ_APP_NAME)-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 
25
+$(MOZ_APP_NAME)-trunk-config:: mozilla-config.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 
26
        cat $< | sed \
 
27
        -e "s|%prefix%|$(prefix)|" \
 
28
        -e "s|%exec_prefix%|$(exec_prefix)|" \
 
29
@@ -85,7 +85,7 @@
 
30
        -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 
31
        -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" > $@
 
32
 
 
33
-$(MOZ_APP_NAME)-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 
34
+$(MOZ_APP_NAME)-trunk-%.pc : mozilla-%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
 
35
        cat $< | sed \
 
36
        -e "s|%prefix%|$(prefix)|" \
 
37
        -e "s|%exec_prefix%|$(exec_prefix)|" \
 
38
@@ -101,7 +101,7 @@
 
39
        -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
 
40
        -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
 
41
 
 
42
-libs:: $(MOZ_APP_NAME)-config
 
43
+libs:: $(MOZ_APP_NAME)-trunk-config
 
44
        chmod 755 $<
 
45
        $(INSTALL) -m 755 $< $(DIST)/bin
 
46
 
 
47
@@ -116,7 +116,7 @@
 
48
 install:: run-mozilla.sh
 
49
        $(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(mozappdir)
 
50
 
 
51
-install:: $(MOZ_APP_NAME)-config
 
52
+install:: $(MOZ_APP_NAME)-trunk-config
 
53
        $(SYSINSTALL) $(IFLAGS2) $< $(DESTDIR)$(bindir)
 
54
 
 
55
 install:: $(pkg_config_files)
 
56
Index: mozilla/config/autoconf.mk.in
 
57
===================================================================
 
58
--- mozilla.orig/config/autoconf.mk.in  2007-01-17 20:38:56.000000000 +0000
 
59
+++ mozilla/config/autoconf.mk.in       2007-03-20 14:25:01.000000000 +0000
 
60
@@ -58,14 +58,14 @@
 
61
 prefix         = @prefix@
 
62
 exec_prefix    = @exec_prefix@
 
63
 bindir         = @bindir@
 
64
-includedir     = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 
65
+includedir     = @includedir@/$(MOZ_APP_NAME)-trunk
 
66
 libdir         = @libdir@
 
67
 datadir                = @datadir@
 
68
 mandir         = @mandir@
 
69
-idldir         = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 
70
+idldir         = @datadir@/idl/$(MOZ_APP_NAME)-trunk
 
71
 
 
72
-mozappdir      = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 
73
-mredir         = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
 
74
+mozappdir      = $(libdir)/$(MOZ_APP_NAME)-trunk
 
75
+mredir         = $(libdir)/mre/mre-trunk
 
76
 mrelibdir      = $(mredir)/lib
 
77
 
 
78
 DIST           = $(DEPTH)/dist
 
79
Index: mozilla/browser/app/Makefile.in
 
80
===================================================================
 
81
--- mozilla.orig/browser/app/Makefile.in        2007-03-20 15:27:15.000000000 +0000
 
82
+++ mozilla/browser/app/Makefile.in     2007-03-20 16:53:10.000000000 +0000
 
83
@@ -87,9 +87,9 @@
 
84
 MOZILLA_INTERNAL_API = 1
 
85
 
 
86
 ifeq ($(USE_SHORT_LIBNAME), 1)
 
87
-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
 
88
+PROGRAM = $(MOZ_APP_NAME)-trunk$(BIN_SUFFIX)
 
89
 else
 
90
-PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
 
91
+PROGRAM = $(MOZ_APP_NAME)-trunk-bin$(BIN_SUFFIX)
 
92
 endif
 
93
 
 
94
 REQUIRES = \