diff options
| author | Michael Hanson <mihanson@linhes.org> | 2012-04-14 05:13:05 (GMT) |
|---|---|---|
| committer | Michael Hanson <mihanson@linhes.org> | 2012-04-14 05:13:05 (GMT) |
| commit | 5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43 (patch) | |
| tree | acde2ddc972337f648a826f3d961dcb8bebf892a /abs/extra/usbmuxd/usbmuxd-describe.patch | |
| parent | 8e721470713e6a5a164f1d7682b0d248cb87b03c (diff) | |
| parent | 502a19b42d9df3fb3c3e521a37eebd20f9fbd984 (diff) | |
| download | linhes_pkgbuild-5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43.zip linhes_pkgbuild-5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43.tar.gz linhes_pkgbuild-5e96cb93d1f17a98a8f8a118b2659ea4d71d3f43.tar.bz2 | |
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Conflicts:
abs/extra/bluez/PKGBUILD
abs/extra/bluez/__changelog
Diffstat (limited to 'abs/extra/usbmuxd/usbmuxd-describe.patch')
| -rw-r--r-- | abs/extra/usbmuxd/usbmuxd-describe.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/abs/extra/usbmuxd/usbmuxd-describe.patch b/abs/extra/usbmuxd/usbmuxd-describe.patch new file mode 100644 index 0000000..3023235 --- /dev/null +++ b/abs/extra/usbmuxd/usbmuxd-describe.patch @@ -0,0 +1,20 @@ +--- usbmuxd-1.0.7/Modules/describe.sh.orig 2012-04-07 22:37:03.218203610 +0000 ++++ usbmuxd-1.0.7/Modules/describe.sh 2012-04-07 22:37:22.979010437 +0000 +@@ -1,17 +1,8 @@ + #!/bin/bash + +-# Check for git and a git repo. +-if head=`git rev-parse --verify HEAD 2>/dev/null`; then +- /bin/echo -n `git describe` +- +- # Are there uncommitted changes? +- git update-index --refresh --unmerged > /dev/null +- git diff-index --quiet HEAD || /bin/echo -n -dirty +-else + # Check for version tag + if [ -e version.tag ]; then + /bin/echo -n `cat version.tag` + fi +-fi + + echo |