From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 18 Oct 2012 19:45:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/thirteen' into thirteen
X-Git-Tag: v2.13-beta1~140^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58ca93ccba8d26feb00304e5b289da0d7305226a;p=ipfire-2.x.git

Merge remote-tracking branch 'origin/thirteen' into thirteen
---

58ca93ccba8d26feb00304e5b289da0d7305226a
diff --cc lfs/pakfire3
index 0dd8c53533,1403a81018..a0e19ddb2a
--- a/lfs/pakfire3
+++ b/lfs/pakfire3
@@@ -24,54 -24,27 +24,52 @@@
  
  include Config
  
 -VER	   = 0
 +VER        = 0.9.23
  
 -THISAPP    = pakfire3-deps
 +THISAPP    = pakfire-$(VER)
 +DL_FILE    = $(THISAPP).tar.gz
 +DL_FROM    = http://source.ipfire.org/releases/pakfire/
 +DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
 -PROG	   = pakfire3-deps
 -PAK_VER    = 2
 -DEPS       = "intltool git make libsatsolver pycurl python-satsolver python-distutils python-distutils-extra python-lzma python-progressbar python-xattr sqlite urlgrabber"
 +PROG	   = pakfire3
 +PAK_VER    = 1
- DEPS       = \
- 	libsatsolver \
- 	pycurl \
- 	python-progressbar \
- 	python-xattr \
- 	sqlite \
- 	urlgrabber
+ 
++DEPS       = "libsatsolver pycurl python-progressbar python-xattr sqlite urlgrabber"
 +
 +###############################################################################
 +# Top-level Rules
  ###############################################################################
  
 +objects = $(DL_FILE)
 +
 +$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 +
 +$(DL_FILE)_MD5 = 10e6dd51c917faa8bd2e7435495de211
 +
  install : $(TARGET)
  
 -check :
 +check : $(patsubst %,$(DIR_CHK)/%,$(objects))
  
 -download :
 +download :$(patsubst %,$(DIR_DL)/%,$(objects))
  
 -md5 :
 +md5 : $(subst %,%_MD5,$(objects))
  
+ dist: 
+ 	@$(PAK)
+ 
 +###############################################################################
 +# Downloading, checking, md5sum
 +###############################################################################
 +
 +$(patsubst %,$(DIR_CHK)/%,$(objects)) :
 +	@$(CHECK)
 +
 +$(patsubst %,$(DIR_DL)/%,$(objects)) :
 +	@$(LOAD)
 +
 +$(subst %,%_MD5,$(objects)) :
 +	@$(MD5)
 +
  ###############################################################################
  # Installation Details
  ###############################################################################