Branch 'f15-branch' - 3 commits - HACKING Makefile

[Brian C. Lane]

 HACKING  |    4 ++--
 Makefile |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a7c3d91d07450b328c45c6dbef8d5cf038802240
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Tue Mar 29 09:12:27 2011 -0700

    Version 15.6

diff --git a/Makefile b/Makefile
index 027f6a5..1751834 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 15.5
+VERSION = 15.6
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit 15595b2192750bee6a20225a35b9baea708e5f77
Author: Brian C. Lane <bcl(a)redhat.com&gt;
Date:   Mon Mar 21 09:38:58 2011 -0700

    Symlink image-creator instead of hardlink (#689167)
    
    Fixes conflicting selinux contexts between livecd-creator and
    image-creator

diff --git a/Makefile b/Makefile
index 5d360aa..027f6a5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ man:
 
 install: man
 	$(INSTALL_PROGRAM) -D tools/livecd-creator $(DESTDIR)/usr/bin/livecd-creator
-	ln $(DESTDIR)/usr/bin/livecd-creator $(DESTDIR)/usr/bin/image-creator
+	ln -s ./livecd-creator $(DESTDIR)/usr/bin/image-creator
 	$(INSTALL_PROGRAM) -D tools/liveimage-mount $(DESTDIR)/usr/bin/liveimage-mount
 	$(INSTALL_PROGRAM) -D tools/livecd-iso-to-disk.sh $(DESTDIR)/usr/bin/livecd-iso-to-disk
 	$(INSTALL_PROGRAM) -D tools/livecd-iso-to-pxeboot.sh
$(DESTDIR)/usr/bin/livecd-iso-to-pxeboot


commit 839e0ba17cacedaa7da10506a51a54b65644a39d
Author: Lubomir Rintel <lkundrak(a)v3.sk&gt;
Date:   Fri Mar 11 12:19:05 2011 -0800

    Mailing list address changed

diff --git a/HACKING b/HACKING
index e912112..00fbe3c 100644
--- a/HACKING
+++ b/HACKING
@@ -17,9 +17,9 @@ Change history etc. can be obtained from the web interface
 PATCHES
 =======
 
-Send patches to the fedora-livecd-list(a)redhat.com mailing list
+Send patches to the livecd(a)lists.fedoraproject.org mailing list
 
- http://www.redhat.com/mailman/listinfo/fedora-livecd-list
+ https://lists.fedoraproject.org/mailman/listinfo/livecd
 
 If you have a number of patches and want to have them pulled from a
 public git repository, please post a pointer to it as well as sending