merge of '752a299fb6dac3f47f04ff23bc60eb3cbf0fcc44'

     and '8119e9385c70c493e4f797e81537765d2dd31127'

7 files changed, 10 insertions, 8 deletions

diff --git a/packages/netbase/netbase/if-post-down.d/.mtn2git_empty b/packages/netbase/netbase/if-post-down.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/if-post-down.d/.mtn2git_empty
diff --git a/packages/netbase/netbase/if-pre-up.d/.mtn2git_empty b/packages/netbase/netbase/if-pre-up.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/if-pre-up.d/.mtn2git_empty
diff --git a/packages/netbase/netbase/if-up.d/.mtn2git_empty b/packages/netbase/netbase/if-up.d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/netbase/netbase/if-up.d/.mtn2git_empty
diff --git a/packages/xcalibrate/xcalibrate_git.bb b/packages/xcalibrate/xcalibrate_git.bb
index 7b2b4d3b63..aba693ad6c 100644
--- a/packages/xcalibrate/xcalibrate_git.bb
+++ b/packages/xcalibrate/xcalibrate_git.bb
@@ -1,11 +1,12 @@
-PV = "0.0+git${SRCDATE}"
 LICENSE = "BSD-X"
 SECTION = "x11/libs"
 PRIORITY = "optional"
 DEPENDS = "virtual/libx11 xcalibrateext libxext"
 DESCRIPTION = "XCalibrate client-side library"
 
-SRC_URI = "git://anongit.freedesktop.org/xorg/lib/libXCalibrate;protocol=git"
+PV = "0.0+git4be232e30cd33a44a1ce6d3ec429ee6101540c62"
+
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/packages/xcalibrateext/xcalibrateext_git.bb b/packages/xcalibrateext/xcalibrateext_git.bb
index 9e5943a70b..16955b5753 100644
--- a/packages/xcalibrateext/xcalibrateext_git.bb
+++ b/packages/xcalibrateext/xcalibrateext_git.bb
@@ -1,11 +1,11 @@
-PV = "0.0+git${SRCDATE}"
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
 DESCRIPTION = "XCalibrate extension headers"
 
+PV = "0.0+gita1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
 PR = "r1"
 
-SRC_URI = "git://anongit.freedesktop.org/xorg/proto/calibrateproto;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
diff --git a/packages/xorg-lib/libxcalibrate_git.bb b/packages/xorg-lib/libxcalibrate_git.bb
index 94b5265103..4e70d2670a 100644
--- a/packages/xorg-lib/libxcalibrate_git.bb
+++ b/packages/xorg-lib/libxcalibrate_git.bb
@@ -3,13 +3,13 @@ SECTION = "x11/libs"
 PRIORITY = "optional"
 LICENSE = "BSD-X"
 
-PV = "0.0+git${SRCDATE}"
+PV = "0.0+git4be232e30cd33a44a1ce6d3ec429ee6101540c62"
 
 DEPENDS = "virtual/libx11 calibrateproto libxext"
 
 FILES_${PN}-locale += "${datadir}/X11/locale"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate;protocol=git;tag=4be232e30cd33a44a1ce6d3ec429ee6101540c62"
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
@@ -17,3 +17,4 @@ inherit autotools pkgconfig
 do_stage() {
 	autotools_stage_all
 }
+	
diff --git a/packages/xorg-proto/calibrateproto_git.bb b/packages/xorg-proto/calibrateproto_git.bb
index 8c61f3c0a4..bc407badb4 100644
--- a/packages/xorg-proto/calibrateproto_git.bb
+++ b/packages/xorg-proto/calibrateproto_git.bb
@@ -2,8 +2,8 @@ require xorg-proto-common.inc
 
 DESCRIPTION = "	Touchscreen calibration protocol"
 
-PV = "0.0+git${SRCDATE}"
+PV = "0.0+gita1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
 
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git"
+SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto;protocol=git;tag=a1d5ef0c73fbef3e758c51b57ac69ba9567bae04"
 S = "${WORKDIR}/git"