[oe-commits] org.oe.dev tzdata: Both tzdata and tzdata-dbg provided tzdata, ipkg picked tzdata-dbg. Kill the -dbg package, try to provide a upgrade path

[freyther commit]

tzdata: Both tzdata and tzdata-dbg provided tzdata, ipkg picked tzdata-dbg. Kill the -dbg package, try to provide a upgrade path

    The tzdata-dbg package was empty but provided "tzdata".
    The tzdata package was not empty and provided "tzdata" as well

    ipkg picked tzdata-dbg resulting in files like /usr/share/zoneinfo/America/New_York
    missing from the image.

    Kill the -dbg package, set RREPLACES on the tzdata package, I don't know how to force
    the update for people that have tzdata-dbg already deployed.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 3497897aabefa260ab1125e79f685e5829fbf106
ViewMTN: http://monotone.openembedded.org/revision/info/3497897aabefa260ab1125e79f685e5829fbf106
Files:
1
packages/tzdata/tzdata_2007k.bb
Diffs:

#
# mt diff -r2ab4654252e4259b36c091c1b92a8bdb94b03b8d -r3497897aabefa260ab1125e79f685e5829fbf106
#
#
#
# patch "packages/tzdata/tzdata_2007k.bb"
#  from [ca74a46ba89c18fd4de893f2e4e288e86d2fb159]
#    to [56201753cfbe50b131cbc65a13fcd804ebfbeec6]
#
============================================================
--- packages/tzdata/tzdata_2007k.bb	ca74a46ba89c18fd4de893f2e4e288e86d2fb159
+++ packages/tzdata/tzdata_2007k.bb	56201753cfbe50b131cbc65a13fcd804ebfbeec6
@@ -3,7 +3,7 @@ DEPENDS = "tzcode-native"
 PRIORITY = "optional"
 DEPENDS = "tzcode-native"
 
-PR = "r1"
+PR = "r2"
 
 PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
             tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
@@ -14,6 +14,8 @@ RCONFLICTS= "timezones timezone-africa t
              timezone-australia timezone-europe timezone-indian \
              timezone-iso3166.tab timezone-pacific timezone-zone.tab"
 
+RREPLACES_tzdata = "tzdata-dbg"
+
 SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz"
 
 S = "${WORKDIR}"
@@ -42,7 +44,7 @@ do_install () {
 # Packages primarily organized by directory with a major city
 # in most time zones in the base package
 
-PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
+PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \
     tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \
     tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"