diff options
| author | Fabien Tassin <fta@sofaraway.org> | 2008-01-04 01:19:43 +0100 |
|---|---|---|
| committer | Fabien Tassin <fta@sofaraway.org> | 2008-01-04 01:19:43 +0100 |
| commit | 776d906107cf3163959acc041edfcb4227a0ed71 (patch) | |
| tree | 3a8da8d20246ce3e8eb861808962100f81150951 | |
| parent | 2fe338df2283640ebbdc378000d6c224c1aeb54f (diff) | |
* Move patches for mozilla/client.mk inside src/ as they were previously
missed at install time. This will prevent confusions with other future
scripts
* Drop Changelog.txt, use debian/changelog instead
| -rw-r--r-- | Changelog.txt | 3 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | src/mozclient.mk.in | 3 | ||||
| -rw-r--r-- | src/patches/nspr_target.patch (renamed from patches/nspr_target.patch) | 0 | ||||
| -rw-r--r-- | src/patches/nss_target.patch (renamed from patches/nss_target.patch) | 0 | ||||
| -rw-r--r-- | src/patches/series (renamed from patches/series) | 0 | ||||
| -rw-r--r-- | src/patches/xulbrowser_target.patch (renamed from patches/xulbrowser_target.patch) | 0 |
8 files changed, 14 insertions, 4 deletions
diff --git a/Changelog.txt b/Changelog.txt deleted file mode 100644 index 0416b35..0000000 --- a/Changelog.txt +++ /dev/null @@ -1,3 +0,0 @@ -2007/12/30 - fta - 0.01 - - initial release after a full rewrite - - Add debian packaging diff --git a/debian/changelog b/debian/changelog index 09316de..e2559a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +mozilla-devscripts (0.02) UNRELEASED; urgency=low + + * Move patches for mozilla/client.mk inside src/ as they were previously + missed at install time. This will prevent confusions with other future + scripts + * Drop Changelog.txt, use debian/changelog instead + + -- Fabien Tassin <fta@sofaraway.org> Thu, 03 Jan 2008 21:50:21 +0100 + mozilla-devscripts (0.01) hardy; urgency=low * Initial version (LP: #179501) diff --git a/src/Makefile b/src/Makefile index bf53346..7f5158a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -40,6 +40,7 @@ extra_mk_files = \ cat $< | sed \ -e "s|^\(include\) \(.*\)\.in|\1 $(DATADIR)/\2|" \ -e "s|^\(MOZCLIENT_EXCLUDE_SCRIPT.*=[ ][ ]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \ + -e "s|^\(MOZCLIENT_PATCHES.*=[ ][ ]*\)\(.*/\)\(.*\)|\1$(DATADIR)/\3|" \ > $@ chmod 644 $@ @@ -49,6 +50,8 @@ install: $(mk_files) $(extra_mk_files) install -m 755 -d $(DESTDIR)$(DATADIR) install -m 644 $^ $(DESTDIR)$(DATADIR) chmod 755 $(DESTDIR)$(DATADIR)/*.sh + install -m 755 -d $(DESTDIR)$(DATADIR)/patches + install -m 644 $(wildcard ../patches/*) $(DESTDIR)$(DATADIR)/patches clean: rm -f $(mk_files) diff --git a/src/mozclient.mk.in b/src/mozclient.mk.in index 99bfd48..acea125 100644 --- a/src/mozclient.mk.in +++ b/src/mozclient.mk.in @@ -80,6 +80,7 @@ MOZCLIENT_CVS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot MOZCLIENT_STAMP ?= stamped MOZCLIENT_TMP := mozclient-tmp +MOZCLIENT_PATCHES := ../patches MOZCLIENT_EXCLUDE_SCRIPT := ../../remove.binonly.sh NOBINONLY := nobinonly @@ -131,7 +132,7 @@ mozclient-patch: $(MOZCLIENT_TMP)/$(MOZCLIENT_STAMP) $(MOZCLIENT_TMP)/$(MOZCLIENT_STAMP): $(MOZ_CLIENT) ifeq (,$(MOZCLIENT_BRANCH)) - if [ ! -L $(MOZCLIENT_TMP)/patches ] ; then ln -s ../../patches $(MOZCLIENT_TMP)/patches ; fi + if [ ! -L $(MOZCLIENT_TMP)/patches ] ; then ln -s $(MOZCLIENT_PATCHES) $(MOZCLIENT_TMP)/patches ; fi cd $(MOZCLIENT_TMP) && quilt --quiltrc /dev/null push -a || test $$? = 2 endif touch $(MOZCLIENT_TMP)/$(MOZCLIENT_STAMP) diff --git a/patches/nspr_target.patch b/src/patches/nspr_target.patch index 1da34c9..1da34c9 100644 --- a/patches/nspr_target.patch +++ b/src/patches/nspr_target.patch diff --git a/patches/nss_target.patch b/src/patches/nss_target.patch index 2965161..2965161 100644 --- a/patches/nss_target.patch +++ b/src/patches/nss_target.patch diff --git a/patches/series b/src/patches/series index 5f43f1b..5f43f1b 100644 --- a/patches/series +++ b/src/patches/series diff --git a/patches/xulbrowser_target.patch b/src/patches/xulbrowser_target.patch index 93750b3..93750b3 100644 --- a/patches/xulbrowser_target.patch +++ b/src/patches/xulbrowser_target.patch |