From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 10 Jan 2006 18:58:42 +0000 (+0000)
Subject: gammu: updated to 1.04.0
X-Git-Tag: Release-2010-05/1~9453^2~2608^2~6^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=209ea6f7e2ce5a88c70ba012133890b6d594f90e;p=openembedded.git

gammu: updated to 1.04.0
- removed ldflags.packages as upstream applied it
---

diff --git a/packages/gammu/gammu/.mtn2git_empty b/packages/gammu/gammu/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gammu/gammu/ldflags.patch b/packages/gammu/gammu/ldflags.patch
deleted file mode 100644
index 90cc0fcd3f..0000000000
--- a/packages/gammu/gammu/ldflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- gammu-1.03.0/cfg/Makefile.glo~ldflags
-+++ gammu-1.03.0/cfg/Makefile.glo
-@@ -126,7 +126,7 @@
- 
- $(TOPDIR)/gammu/gammu: $(COMMON) $(GAMMU)
- 	@echo Linking gammu
--	@$(CC) $(COMMON) $(GAMMU) $(LDLIBS) $(SMSD_LIBS) -o $(TOPDIR)/gammu/gammu
-+	@$(CC) $(COMMON) $(GAMMU) $(LDLIBS) $(SMSD_LIBS) -o $(TOPDIR)/gammu/gammu $(LDFLAGS)
- 
- gammu: $(TOPDIR)/gammu/gammu
- 
-@@ -136,7 +136,7 @@
- 
- $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR): $(COMMON)
- 	@echo Linking libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR)
--	@$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON)
-+	@$(CC) $(LDLIBS) -shared -Wl,-soname -Wl,libGammu.so.$(SONAME_MAJOR) -o $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(COMMON) $(LDFLAGS)
- 	@$(LN) -s libGammu.so.$(SONAME_MAJOR).$(SONAME_MINOR) $(TOPDIR)/common/libGammu.so.$(SONAME_MAJOR)
- 	@$(LN) -s libGammu.so.$(SONAME_MAJOR) $(TOPDIR)/common/libGammu.so
- 
diff --git a/packages/gammu/gammu_1.03.0.bb b/packages/gammu/gammu_1.04.0.bb
similarity index 74%
rename from packages/gammu/gammu_1.03.0.bb
rename to packages/gammu/gammu_1.04.0.bb
index ac5ee676d5..0b18e2a0bd 100644
--- a/packages/gammu/gammu_1.03.0.bb
+++ b/packages/gammu/gammu_1.04.0.bb
@@ -6,9 +6,7 @@ HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html"
 AUTHOR = "Marcin Wiacek <marcin@mwiacek.com>"
 MAINTAINER = "Marcin Juszkiewicz <openembedded@hrw.one.pl>"
 
-SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz \
-file://ldflags.patch;patch=1 \
-"
+SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz "
 
 EXTRA_OECONF = "--disable-mysql"
 
@@ -20,17 +18,17 @@ do_compile () {
 
 do_stage() {
         install -d ${STAGING_INCDIR}/gammu/misc  ${STAGING_INCDIR}/gammu/misc/coding \
-                           ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
-                           ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
-                           ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4 \
-                           ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
-                           ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
-                           ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
-                           ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
-                           ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
-                           ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
-                           ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
-                           ${STAGING_INCDIR}/gammu/protocol/alcatel
+                   ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \
+                   ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \
+                   ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4 \
+                   ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \
+                   ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \
+                   ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \
+                   ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \
+                   ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \
+                   ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \
+                   ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \
+                   ${STAGING_INCDIR}/gammu/protocol/alcatel
 
         oe_libinstall -so -C common libGammu ${STAGING_LIBDIR}