[oe-commits] org.oe.dev links: clean up. Bump PR. partly closes 2234.

[Laibsch commit]

links: clean up.  Bump PR. partly closes 2234.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 1cbdcdd6fe30ea516dc4dd9305478d7519698e2d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1cbdcdd6fe30ea516dc4dd9305478d7519698e2d
Files:
1
packages/links/links-x11_2.0+2.1pre26.bb
packages/links/links_2.0+2.1pre26.bb
Diffs:

#
# mt diff -r142643f8907f82aba62cfaea1ef65a68ca1bf26f -r1cbdcdd6fe30ea516dc4dd9305478d7519698e2d
#
# 
# 
# patch "packages/links/links-x11_2.0+2.1pre26.bb"
#  from [27a6af01d79901825948a0f5aa7aa1e6a134fc15]
#    to [dc6dd707bd089d6eea3aa47394cc724e4eceb8b8]
# 
# patch "packages/links/links_2.0+2.1pre26.bb"
#  from [d68e882e0eb16b5b45acddc5aa53a110c120ac3e]
#    to [45df7d936630b46a57465b65cb96dc434da083d5]
# 
============================================================
--- packages/links/links-x11_2.0+2.1pre26.bb	27a6af01d79901825948a0f5aa7aa1e6a134fc15
+++ packages/links/links-x11_2.0+2.1pre26.bb	dc6dd707bd089d6eea3aa47394cc724e4eceb8b8
@@ -1,8 +1,9 @@ RCONFLICTS = "links"
 require links.inc
 
 DEPENDS += "virtual/libx11"
 RCONFLICTS = "links"
-PR = "r0"
+PR = "r1"
+
 SRC_URI += " file://links2.desktop \
              http://www.xora.org.uk/oe/links2.png"
 
============================================================
--- packages/links/links_2.0+2.1pre26.bb	d68e882e0eb16b5b45acddc5aa53a110c120ac3e
+++ packages/links/links_2.0+2.1pre26.bb	45df7d936630b46a57465b65cb96dc434da083d5
@@ -1,8 +1,8 @@ DEPENDS += "gpm"
 require links.inc
 
 DEPENDS += "gpm"
-RCONFLICTS="links-x11"
-PR = "r0"
+RCONFLICTS = "links-x11"
+PR = "r1"
 
 EXTRA_OECONF = "--enable-javascript --with-libfl --enable-graphics \
 	        --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \