- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] update zlib library name in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:29 2012 -0300 update zlib library name in linux makefile --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8e424cb..d3a2697 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -246,7 +246,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 06352bd7c7bf2bd240ca423d6c700606f6fc3e96 Merge: 85b9503 a90ae13 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:43 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.3] update zlib library name in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:29 2012 -0300 update zlib library name in linux makefile --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8e424cb..d3a2697 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -246,7 +246,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \

1 0

[torbrowser/master] update zlib library name in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit a90ae13ca9094aaa8527e7c78446f4c2580d0aab Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:29 2012 -0300 update zlib library name in linux makefile --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 8e424cb..d3a2697 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -246,7 +246,7 @@ install-binaries: cp -d $(QT)/libQtNetwork.so* $(LIBSDIR) cp -d $(QT)/libQtXml.so* $(LIBSDIR) # zlib - cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz + cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.7 $(LIBSDIR)/libz # Libevent cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 06352bd7c7bf2bd240ca423d6c700606f6fc3e96 Merge: 85b9503 a90ae13 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:43:43 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torbrowser/maint-2.2] update libevent library names in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 49d3d2e..8e424cb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,9 +248,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.6 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.7 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 85b9503ab572248e76cfb1dab7fbb7f9931e65c3 Merge: 14fe42a ad859b0 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:42:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 12 May '12

12 May '12

commit 85b9503ab572248e76cfb1dab7fbb7f9931e65c3 Merge: 14fe42a ad859b0 Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:42:04 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torbrowser/master] update libevent library names in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 49d3d2e..8e424cb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,9 +248,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.6 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.7 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng

1 0

[torbrowser/maint-2.3] update libevent library names in linux makefile
by erinn＠torproject.org 12 May '12

12 May '12

commit ad859b060ec77434eb9ea6d2733758f8aa84f73e Author: Erinn Clark <erinn(a)torproject.org> Date: Sat May 12 10:41:41 2012 -0300 update libevent library names in linux makefile --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 49d3d2e..8e424cb 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -248,9 +248,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.6 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.6 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.6 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.6 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.7 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.7 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.7 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng

1 0