Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
	config/rootfiles/core/49/filelists/files
	config/rootfiles/core/49/update.sh
This commit is contained in:
Arne Fitzenreiter
2011-04-02 17:56:33 +02:00
11 changed files with 44 additions and 10 deletions

View File

@@ -27,13 +27,13 @@ include Config
VER = 1.00
THISAPP = ipfireseeder-$(VER)
DL_FILE = ipfire-2.9.i586-full-core47.iso.torrent
DL_FILE = ipfire-2.9.i586-full-core48.iso.torrent
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ipfireseeder
PAK_VER = 23
PAK_VER = 24
DEPS = "rtorrent"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 388d32a2f741df4afa76578948804ae3
$(DL_FILE)_MD5 = 37dd855f48af4efae045eb9b1f971a6e
install : $(TARGET)

View File

@@ -24,7 +24,7 @@
include Config
VER = 2009.4.4
VER = 2011.1.15
THISAPP = ntfs-3g-$(VER)
DL_FILE = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = e0b5c170f088a8d82968f0a6b34d31da
$(DL_FILE)_MD5 = 15a5cf5752012269fa168c24191f00e2
install : $(TARGET)