diff options
author | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2012-04-03 15:53:18 -0700 |
commit | a1d8b94647b6149ca38282eefac6a5f1e89fad5b (patch) | |
tree | 7d1fcc50bee55159aa0206f148ee45188da963ec /host/cmake/debian | |
parent | 40884c9411bf7d4bc91d24c939c22a3a04193d82 (diff) | |
parent | 51c81a39cc15ac221376e5acc4eceb572e0467f9 (diff) | |
download | uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.gz uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.tar.bz2 uhd-a1d8b94647b6149ca38282eefac6a5f1e89fad5b.zip |
Merge branch 'master' into next
Conflicts:
host/examples/CMakeLists.txt
Diffstat (limited to 'host/cmake/debian')
-rwxr-xr-x | host/cmake/debian/preinst.in | 2 | ||||
-rwxr-xr-x | host/cmake/debian/prerm.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/host/cmake/debian/preinst.in b/host/cmake/debian/preinst.in index 9e8e50b90..71246b7e7 100755 --- a/host/cmake/debian/preinst.in +++ b/host/cmake/debian/preinst.in @@ -17,5 +17,5 @@ # if [ "$1" = "install" ]; then - echo + echo 'Installing UHD.' fi diff --git a/host/cmake/debian/prerm.in b/host/cmake/debian/prerm.in index 30ce41963..dfe491767 100755 --- a/host/cmake/debian/prerm.in +++ b/host/cmake/debian/prerm.in @@ -17,6 +17,7 @@ # if [ "$1" = "remove" ]; then + echo 'Uninstalling UHD.' rm /etc/udev/rules.d/uhd-usrp.rules udevadm control --reload-rules fi |