From 2e1bf6023a9ffab6a2c74dcf4e73c3f3bb9c37af Mon Sep 17 00:00:00 2001 From: jow Date: Sat, 4 Feb 2012 19:28:55 +0000 Subject: [PATCH] [packages_10.03.2] ftpd-topfield: merge r29199, r29223 git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30072 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- multimedia/ftpd-topfield/Makefile | 16 +++++++++++++--- .../files/{ftpd-topfield.conf => ftpd-topfield.config} | 0 .../files/{ftpd-topfield.sh => ftpd-topfield.init} | 0 3 files changed, 13 insertions(+), 3 deletions(-) rename multimedia/ftpd-topfield/files/{ftpd-topfield.conf => ftpd-topfield.config} (100%) rename multimedia/ftpd-topfield/files/{ftpd-topfield.sh => ftpd-topfield.init} (100%) diff --git a/multimedia/ftpd-topfield/Makefile b/multimedia/ftpd-topfield/Makefile index 6259d4d..c271cb4 100644 --- a/multimedia/ftpd-topfield/Makefile +++ b/multimedia/ftpd-topfield/Makefile @@ -1,9 +1,15 @@ +# +# Copyright (C) 2008-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# include $(TOPDIR)/rules.mk PKG_NAME:=ftpd-topfield PKG_VERSION:=0.7.4 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/puppy @@ -30,9 +36,13 @@ define Package/ftpd-topfield/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ftpd $(1)/usr/sbin/ftpd-topfield $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/ftpd-topfield.sh $(1)/etc/init.d/ftpd-topfield + $(INSTALL_BIN) ./files/ftpd-topfield.init $(1)/etc/init.d/ftpd-topfield $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/ftpd-topfield.conf $(1)/etc/config/ftpd-topfield + $(INSTALL_DATA) ./files/ftpd-topfield.config $(1)/etc/config/ftpd-topfield +endef + +define Package/ftpd-topfield/conffiles +/etc/config/ftpd-topfield endef $(eval $(call BuildPackage,ftpd-topfield)) diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.conf b/multimedia/ftpd-topfield/files/ftpd-topfield.config similarity index 100% rename from multimedia/ftpd-topfield/files/ftpd-topfield.conf rename to multimedia/ftpd-topfield/files/ftpd-topfield.config diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.sh b/multimedia/ftpd-topfield/files/ftpd-topfield.init similarity index 100% rename from multimedia/ftpd-topfield/files/ftpd-topfield.sh rename to multimedia/ftpd-topfield/files/ftpd-topfield.init -- 2.11.0