From 5cd7853a875be12e331b2f0dc67eda2c9845e4f8 Mon Sep 17 00:00:00 2001 From: Gerardo Di Iorio Date: Sat, 29 Jan 2011 15:47:24 +0100 Subject: [PATCH 1/8] Update apcupsd to 3.14.8 and refresh patch Signed-off-by: Gerardo Di Iorio --- package/base/apcupsd/apcupsd.desc | 4 ++-- package/base/apcupsd/install.patch | 36 ++++++++---------------------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/package/base/apcupsd/apcupsd.desc b/package/base/apcupsd/apcupsd.desc index 9080423..0fc2cc4 100644 --- a/package/base/apcupsd/apcupsd.desc +++ b/package/base/apcupsd/apcupsd.desc @@ -29,7 +29,7 @@ [L] GPL [S] Stable -[V] 3.14.7 +[V] 3.14.8 [P] X -----5---9 800.000 -[D] 3628597761 apcupsd-3.14.7.tar.gz http://dl.sourceforge.net/sourceforge/apcupsd/ +[D] 3676486453 apcupsd-3.14.8.tar.gz http://dl.sourceforge.net/sourceforge/apcupsd/ diff --git a/package/base/apcupsd/install.patch b/package/base/apcupsd/install.patch index 952a482..bc6968f 100644 --- a/package/base/apcupsd/install.patch +++ b/package/base/apcupsd/install.patch @@ -1,22 +1,6 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../apcupsd/install.patch -# Copyright (C) 2008 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - ---- apcupsd-3.14.4/src/Makefile.vanilla 2008-05-26 10:24:11.000000000 +0200 -+++ apcupsd-3.14.4/src/Makefile 2008-05-26 10:24:39.000000000 +0200 -@@ -46,13 +46,13 @@ +--- apcupsd-3.14.8/src/Makefile.vanilla 2011-01-29 15:44:44.256000006 +0100 ++++ apcupsd-3.14.8/src/Makefile 2011-01-29 15:45:00.188000006 +0100 +@@ -42,10 +42,10 @@ install-base: $(call MKDIR,$(sbindir)) @@ -29,20 +13,16 @@ + $(call INSTPROG,755,apcaccess,$(sbindir)/) + $(call INSTPROG,755,smtp,$(sbindir)/) - install-powerflute: -- $(call INSTPROG,755,powerflute,$(sbindir)/powerflute) -+ $(call INSTPROG,755,powerflute,$(sbindir)/) - uninstall-base: $(call UNINST,$(sbindir)/apcupsd) ---- apcupsd-3.14.4/autoconf/targets.mak.vanilla 2008-05-26 10:28:00.000000000 +0200 -+++ apcupsd-3.14.4/autoconf/targets.mak 2008-05-26 10:28:23.000000000 +0200 -@@ -152,7 +152,7 @@ +--- apcupsd-3.14.8/autoconf/targets.mak.vanilla 2011-01-29 15:45:07.160000006 +0100 ++++ apcupsd-3.14.8/autoconf/targets.mak 2011-01-29 15:45:18.644000005 +0100 +@@ -189,7 +189,7 @@ # Install a program file, given mode, src, and dest define INSTPROG - @echo " COPY " $(2) =\> $(DESTDIR)$(3) + @$(ECHO) " COPY " $(2) =\> $(DESTDIR)$(3) - $(V)$(INSTALL_PROGRAM) $(STRIP) -m $(1) $(2) $(DESTDIR)$(3) -+ $(V)$(INSTALL_PROGRAM) -m $(1) $(2) $(DESTDIR)$(3) ++ $(V)$(INSTALL_PROGRAM) -m $(1) $(2) $(DESTDIR)$(3) endef # Install a data file, given mode, src, and dest -- 1.7.1