From badb3eafc9060609d6a484f1cc2e19925b5825c4 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 13 Nov 2004 20:11:32 +0000 Subject: Merge the conflict 2004/11/13 21:06:11+01:00 handhelds.org!zecke Opie 1.1.7: Remove CVSDATE and PR from the package files 2004/11/13 20:52:18+01:00 handhelds.org!zecke Update packaging of 1.1.7 to match the 'cvs' version of the Opie versions 2004/11/13 20:36:08+01:00 handhelds.org!zecke Upgrade all Opie 1.1.6 files to Opie 1.1.7 in preparation of the next OpenZaurus/Familiar release. Remove all occurrences of Opie1.1.6 in the files BKrev: 41966a744AeMTtlPuskXFPg512ykqQ --- opie-networksettings/opie-networksettings_1.1.6.oe | 37 ---------------------- opie-networksettings/opie-networksettings_1.1.7.oe | 0 2 files changed, 37 deletions(-) delete mode 100644 opie-networksettings/opie-networksettings_1.1.6.oe create mode 100644 opie-networksettings/opie-networksettings_1.1.7.oe (limited to 'opie-networksettings') diff --git a/opie-networksettings/opie-networksettings_1.1.6.oe b/opie-networksettings/opie-networksettings_1.1.6.oe deleted file mode 100644 index 0f75085e97..0000000000 --- a/opie-networksettings/opie-networksettings_1.1.6.oe +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION = "Opie Network Settings" -SECTION = "opie/settings" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin" -APPNAME = "networksettings" - -TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}" -SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/settings/networksettings \ - cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \ - cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps" - -S = "${WORKDIR}/${APPNAME}" - -inherit opie - -EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}" - -do_install() { - install -d ${D}/${palmtopdir}/pics/${APPNAME}/ - install -d ${D}/${palmtopdir}/pics/Network/ - install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/ - install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/ - install -d ${D}/${palmtopdir}/lib/ - oe_libinstall -so libinterfaces ${D}${palmtopdir}/lib - install -d ${D}/${palmtopdir}/plugins/networksettings/ - for plugin in kppp wlan - do - install lib$plugin.so ${D}/${palmtopdir}/plugins/networksettings/ - done -} - -PACKAGES =+ "opie-networksettings-pppplugin opie-networksettings-wlanplugin" -FILES_opie-networksettings-pppplugin = "${palmtopdir}/plugins/networksettings/libkppp.so" -FILES_opie-networksettings-wlanplugin = "${palmtopdir}/plugins/networksettings/libwlan.so" - diff --git a/opie-networksettings/opie-networksettings_1.1.7.oe b/opie-networksettings/opie-networksettings_1.1.7.oe new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3