Commit 703ad695 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Deal with the aftermath of sorting contrib 

This basically amounts to grepping for every file that mentioned
contrib and adjusting its references to refer to the right place.
parent 9230bc7c

.gitignore

+5 −14
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
*.bak

# Python droppings

*.pyc

*.pyo



# /

/Makefile
@@ -60,20 +61,10 @@ 
/tor-*-win32.exe



# /contrib/

/contrib/Makefile

/contrib/Makefile.in

/contrib/tor.sh

/contrib/torctl

/contrib/torify

/contrib/*.pyc

/contrib/*.pyo

/contrib/tor.logrotate

/contrib/tor.wxs



# /contrib/suse/

/contrib/suse/tor.sh

/contrib/suse/Makefile.in

/contrib/suse/Makefile

/contrib/dist/tor.sh

/contrib/dist/torctl

/contrib/operator-tools/tor.logrotate

/contrib/dist/suse/tor.sh



# /debian/

/debian/files

Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ reset-gcov: 
# Avoid strlcpy.c, strlcat.c, aes.c, OpenBSD_malloc_Linux.c, sha256.c,

# eventdns.[hc], tinytest*.[ch]

check-spaces:

	./contrib/checkSpace.pl -C                    \

	./scripts/maint/checkSpace.pl -C              \

		src/common/*.[ch]		      \

		src/or/*.[ch]			      \

		src/test/*.[ch]			      \
@@ -85,10 +85,10 @@ check-spaces: 
		src/tools/tor-fw-helper/*.[ch]



check-docs:

	./contrib/checkOptionDocs.pl

	./scripts/maint/checkOptionDocs.pl



check-logs:

	./contrib/checkLogs.pl                        \

	./scripts/maint/checkLogs.pl                  \

		src/*/*.[ch] | sort -n



version:

changes/ticket8966

0 → 100644
+7 −0
Original line number Diff line number Diff line 
  o Package cleanup:

    - The contrib directory has been sorted and tidy. Before, it was an

      unsorted dumping ground for useful and not-so-useful things. Now,

      it has been divided based on functionality, and the items which

      seemed to be nonfunctional or useless have been removed. Resolves

      ticket 8966; based on patches from "rl1987".

configure.ac

+6 −6
Original line number Diff line number Diff line
@@ -1557,10 +1557,10 @@ CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_z 
AC_CONFIG_FILES([

        Doxyfile

        Makefile

        contrib/suse/tor.sh

        contrib/tor.logrotate

        contrib/tor.sh

        contrib/torctl

        contrib/dist/suse/tor.sh

        contrib/operator-tools/tor.logrotate

        contrib/dist/tor.sh

        contrib/dist/torctl

        src/config/torrc.sample

])
@@ -1582,6 +1582,6 @@ fi 


AC_OUTPUT



if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

  ./contrib/updateVersions.pl

if test -x /usr/bin/perl && test -x ./scripts/maint/updateVersions.pl ; then

  ./scripts/maint/updateVersions.pl

fi

contrib/dist/suse/include.am

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
EXTRA_DIST+= contrib/suse/tor.sh