diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-12-07 11:02:07 -0300 |
commit | 8a3d4ee5105eefa2136eb7ae83e69d01f29864c3 (patch) | |
tree | 8be9a06d3b2d8cade4b5dba48e040c632bd33850 /extra/tcpdump/tcpdump_duplicate_executable.patch | |
parent | 404b7ff94ece6bb2ce0e9df042ac1fe798137c83 (diff) | |
parent | d1d87d2ac643e3dabc251f3cec7d3b00e29b282c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/zathura/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/libdvdread/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/postgresql/PKGBUILD
Diffstat (limited to 'extra/tcpdump/tcpdump_duplicate_executable.patch')
-rw-r--r-- | extra/tcpdump/tcpdump_duplicate_executable.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/tcpdump/tcpdump_duplicate_executable.patch b/extra/tcpdump/tcpdump_duplicate_executable.patch index 6e27b717a..705983ccc 100644 --- a/extra/tcpdump/tcpdump_duplicate_executable.patch +++ b/extra/tcpdump/tcpdump_duplicate_executable.patch @@ -1,6 +1,6 @@ ---- a/Makefile.in 2010-04-06 03:18:35.000000000 +0200 -+++ b/Makefile.in 2011-04-01 02:39:10.000000000 +0200 -@@ -403,7 +403,6 @@ +--- a/Makefile.in 2011-07-24 22:58:55.000000000 +0200 ++++ b/Makefile.in 2011-12-05 12:59:23.000000000 +0100 +@@ -399,7 +399,6 @@ [ -d $(DESTDIR)$(sbindir) ] || \ (mkdir -p $(DESTDIR)$(sbindir); chmod 755 $(DESTDIR)$(sbindir)) $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG) |