Skip to content

Instantly share code, notes, and snippets.

@khrm

khrm/Merging gsoc branch to the master

Created August 22, 2011 18:34
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save khrm/1163121 to your computer and use it in GitHub Desktop.
Save khrm/1163121 to your computer and use it in GitHub Desktop.
Download ZIP
merge
Raw
Merging gsoc branch to the master
Auto-merging scripts/Makefile.am
Merge made by recursive.
CppUnit/autogen.sh | 21 ++
CppUnit/configure.ac | 44 +++
CppUnit/configure.gnu | 4 +
Installation/32/fed_preins.sh | 189 ++++++++++++
Installation/32/ubu_preins.sh | 184 +++++++++++
Installation/cen5_preins.sh | 298 ++++++++++++++++++
Installation/check.sh | 39 +++
Installation/deb_preins.sh | 195 ++++++++++++
Installation/fed_preins.sh | 189 ++++++++++++
.../sonata-build-meta-1.0.alpha-1.noarch.rpm | Bin 0 -> 2180 bytes
...sonata-build-meta-1.0.alpha.centos-1.noarch.rpm | Bin 0 -> 2033 bytes
.../sonata-build-meta-1.0.alpha.centos.spec | 93 ++++++
.../sonata-build-meta-1.0.alpha.fed-1.noarch.rpm | Bin 0 -> 2180 bytes
Installation/sonata-build-meta-1.0.alpha.fed.spec | 99 ++++++
Installation/sonata-build-meta-1.0.alpha.spec | 99 ++++++
Installation/sonata-build-meta.deb | Bin 0 -> 760 bytes
Installation/sonata-build-meta/DEBIAN/control | 9 +
Installation/suse_preins.sh | 183 +++++++++++
Installation/ubu_preins.sh | 184 +++++++++++
Makefile.am | 8 +
autogen.sh | 122 ++++++++
configure.ac | 48 +++
gsoc/32/fed_preins.sh | 189 ++++++++++++
gsoc/32/ubu_preins.sh | 184 +++++++++++
gsoc/cen5_preins.sh | 298 ++++++++++++++++++
gsoc/check.sh | 39 +++
gsoc/deb_preins.sh | 195 ++++++++++++
gsoc/fed_preins.sh | 189 ++++++++++++
gsoc/sonata-build-meta-1.0.alpha-1.noarch.rpm | Bin 0 -> 2180 bytes
...sonata-build-meta-1.0.alpha.centos-1.noarch.rpm | Bin 0 -> 2033 bytes
gsoc/sonata-build-meta-1.0.alpha.centos.spec | 93 ++++++
gsoc/sonata-build-meta-1.0.alpha.fed-1.noarch.rpm | Bin 0 -> 2180 bytes
gsoc/sonata-build-meta-1.0.alpha.fed.spec | 99 ++++++
gsoc/sonata-build-meta-1.0.alpha.spec | 99 ++++++
gsoc/sonata-build-meta.deb | Bin 0 -> 760 bytes
gsoc/sonata-build-meta/DEBIAN/control | 9 +
gsoc/sonata_i.sh | 183 +++++++++++
gsoc/ubu_preins.sh | 184 +++++++++++
scripts/Makefile.am | 14 +-
scripts/autogen.sh | 45 +++
scripts/configure.ac | 55 ++++
scripts/configure.in | 5 +-
sig-pkg/ATApackets/Makefile.am | 4 +-
sig-pkg/ATApackets/autogen.sh | 49 +++
sig-pkg/ATApackets/configure.ac | 95 ++++++
sig-pkg/ATApackets/src/Makefile.am | 10 +-
sig-pkg/ATApackets/test/Makefile.am | 21 +-
sig-pkg/Makefile.am | 4 +-
sig-pkg/autogen.sh | 100 ++++++
sig-pkg/channelizer/Makefile.am | 4 +-
sig-pkg/channelizer/autogen.sh | 49 +++
sig-pkg/channelizer/configure.ac | 99 ++++++
sig-pkg/channelizer/src/Makefile.am | 39 ++--
sig-pkg/configure.ac | 155 ++++++++++
sig-pkg/daddLib/Makefile.am | 6 +-
sig-pkg/daddLib/autogen.sh | 49 +++
sig-pkg/daddLib/configure.ac | 96 ++++++
sig-pkg/daddLib/src/Makefile.am | 14 +-
sig-pkg/daddLib/test/Makefile.am | 14 +-
sig-pkg/dfbLib/Makefile.am | 4 +-
sig-pkg/dfbLib/autogen.sh | 49 +++
sig-pkg/dfbLib/configure.ac | 96 ++++++
sig-pkg/dfbLib/src/Makefile.am | 8 +-
sig-pkg/dfbLib/test/Makefile.am | 19 +-
sig-pkg/dx/Makefile.am | 4 +-
sig-pkg/dx/autogen.sh | 49 +++
sig-pkg/dx/configure.ac | 101 ++++++
sig-pkg/dx/lib/Makefile.am | 29 +-
sig-pkg/dx/src/Makefile.am | 49 ++--
sig-pkg/dx/test/Makefile.am | 54 ++--
sig-pkg/gaussLib/Makefile.am | 6 +-
sig-pkg/gaussLib/autogen.sh | 49 +++
sig-pkg/gaussLib/configure.ac | 96 ++++++
sig-pkg/gaussLib/src/Makefile.am | 10 +-
sig-pkg/gaussLib/test/Makefile.am | 16 +-
sig-pkg/reconfig | 3 +
sig-pkg/sonataLib/Makefile.am | 6 +-
sig-pkg/sonataLib/autogen.sh | 49 +++
sig-pkg/sonataLib/configure.ac | 100 ++++++
sig-pkg/sonataLib/src/Makefile.am | 20 +-
sig-pkg/spectraLib/Makefile.am | 4 +-
sig-pkg/spectraLib/autogen.sh | 49 +++
sig-pkg/spectraLib/configure.ac | 101 ++++++
sig-pkg/spectraLib/src/Makefile.am | 15 +-
sig-pkg/spectraLib/test/Makefile.am | 17 +-
sig-pkg/utilities/Makefile.am | 4 +-
sig-pkg/utilities/autogen.sh | 84 +++++
sig-pkg/utilities/configure.ac | 94 ++++++
sig-pkg/utilities/packetchan2beam/Makefile.am | 4 +-
sig-pkg/utilities/packetchan2beam/autogen.sh | 49 +++
sig-pkg/utilities/packetchan2beam/configure.ac | 101 ++++++
sig-pkg/utilities/packetchan2beam/src/Makefile.am | 26 +-
sig-pkg/utilities/packetgen/Makefile.am | 4 +-
sig-pkg/utilities/packetgen/autogen.sh | 49 +++
sig-pkg/utilities/packetgen/configure.ac | 99 ++++++
sig-pkg/utilities/packetgen/src/Makefile.am | 34 +--
sig-pkg/utilities/packetread/Makefile.am | 4 +-
sig-pkg/utilities/packetread/autogen.sh | 49 +++
sig-pkg/utilities/packetread/configure.ac | 99 ++++++
sig-pkg/utilities/packetread/src/Makefile.am | 34 +--
sig-pkg/utilities/packetrelay/Makefile.am | 4 +-
sig-pkg/utilities/packetrelay/autogen.sh | 49 +++
sig-pkg/utilities/packetrelay/configure.ac | 99 ++++++
sig-pkg/utilities/packetrelay/src/Makefile.am | 36 +--
sig-pkg/utilities/packetsend/Makefile.am | 4 +-
sig-pkg/utilities/packetsend/autogen.sh | 49 +++
sig-pkg/utilities/packetsend/configure.ac | 99 ++++++
sig-pkg/utilities/packetsend/src/Makefile.am | 32 +-
sig-pkg/utilities/packetsqimport/Makefile.am | 4 +-
sig-pkg/utilities/packetsqimport/autogen.sh | 49 +++
sig-pkg/utilities/packetsqimport/configure.ac | 101 ++++++
sig-pkg/utilities/packetsqimport/src/Makefile.am | 28 +-
sse-pkg/Makefile.am | 4 +-
sse-pkg/autogen.sh | 46 +++
sse-pkg/configure.ac | 321 ++++++++++++++++++++
sse-pkg/ifc/Makefile.am | 13 +-
sse-pkg/m4/ax_ext_have_lib.m4 | 77 +++++
sse-pkg/reconfig | 2 +
sse-pkg/sse/Makefile.am | 5 +-
sse-pkg/tsig/Makefile.am | 10 +-
tclreadline/autogen.sh | 18 ++
tclreadline/configure.ac | 282 +++++++++++++++++
122 files changed, 7421 insertions(+), 344 deletions(-)
create mode 100755 CppUnit/autogen.sh
create mode 100644 CppUnit/configure.ac
create mode 100644 CppUnit/configure.gnu
create mode 100755 Installation/32/fed_preins.sh
create mode 100644 Installation/32/ubu_preins.sh
create mode 100755 Installation/cen5_preins.sh
create mode 100755 Installation/check.sh
create mode 100755 Installation/deb_preins.sh
create mode 100755 Installation/fed_preins.sh
create mode 100644 Installation/sonata-build-meta-1.0.alpha-1.noarch.rpm
create mode 100644 Installation/sonata-build-meta-1.0.alpha.centos-1.noarch.rpm
create mode 100644 Installation/sonata-build-meta-1.0.alpha.centos.spec
create mode 100644 Installation/sonata-build-meta-1.0.alpha.fed-1.noarch.rpm
create mode 100644 Installation/sonata-build-meta-1.0.alpha.fed.spec
create mode 100644 Installation/sonata-build-meta-1.0.alpha.spec
create mode 100644 Installation/sonata-build-meta.deb
create mode 100644 Installation/sonata-build-meta/DEBIAN/control
create mode 100755 Installation/suse_preins.sh
create mode 100644 Installation/ubu_preins.sh
create mode 100755 Makefile.am
create mode 100755 autogen.sh
create mode 100644 configure.ac
create mode 100755 gsoc/32/fed_preins.sh
create mode 100644 gsoc/32/ubu_preins.sh
create mode 100755 gsoc/cen5_preins.sh
create mode 100755 gsoc/check.sh
create mode 100755 gsoc/deb_preins.sh
create mode 100755 gsoc/fed_preins.sh
create mode 100644 gsoc/sonata-build-meta-1.0.alpha-1.noarch.rpm
create mode 100644 gsoc/sonata-build-meta-1.0.alpha.centos-1.noarch.rpm
create mode 100644 gsoc/sonata-build-meta-1.0.alpha.centos.spec
create mode 100644 gsoc/sonata-build-meta-1.0.alpha.fed-1.noarch.rpm
create mode 100644 gsoc/sonata-build-meta-1.0.alpha.fed.spec
create mode 100644 gsoc/sonata-build-meta-1.0.alpha.spec
create mode 100644 gsoc/sonata-build-meta.deb
create mode 100644 gsoc/sonata-build-meta/DEBIAN/control
create mode 100755 gsoc/sonata_i.sh
create mode 100644 gsoc/ubu_preins.sh
create mode 100755 scripts/autogen.sh
create mode 100644 scripts/configure.ac
create mode 100755 sig-pkg/ATApackets/autogen.sh
create mode 100644 sig-pkg/ATApackets/configure.ac
create mode 100755 sig-pkg/autogen.sh
create mode 100755 sig-pkg/channelizer/autogen.sh
create mode 100644 sig-pkg/channelizer/configure.ac
create mode 100644 sig-pkg/configure.ac
create mode 100755 sig-pkg/daddLib/autogen.sh
create mode 100644 sig-pkg/daddLib/configure.ac
create mode 100755 sig-pkg/dfbLib/autogen.sh
create mode 100644 sig-pkg/dfbLib/configure.ac
create mode 100755 sig-pkg/dx/autogen.sh
create mode 100644 sig-pkg/dx/configure.ac
create mode 100755 sig-pkg/gaussLib/autogen.sh
create mode 100644 sig-pkg/gaussLib/configure.ac
create mode 100755 sig-pkg/sonataLib/autogen.sh
create mode 100644 sig-pkg/sonataLib/configure.ac
create mode 100755 sig-pkg/spectraLib/autogen.sh
create mode 100644 sig-pkg/spectraLib/configure.ac
create mode 100755 sig-pkg/utilities/autogen.sh
create mode 100755 sig-pkg/utilities/configure.ac
create mode 100755 sig-pkg/utilities/packetchan2beam/autogen.sh
create mode 100644 sig-pkg/utilities/packetchan2beam/configure.ac
create mode 100755 sig-pkg/utilities/packetgen/autogen.sh
create mode 100644 sig-pkg/utilities/packetgen/configure.ac
create mode 100755 sig-pkg/utilities/packetread/autogen.sh
create mode 100644 sig-pkg/utilities/packetread/configure.ac
create mode 100755 sig-pkg/utilities/packetrelay/autogen.sh
create mode 100644 sig-pkg/utilities/packetrelay/configure.ac
create mode 100755 sig-pkg/utilities/packetsend/autogen.sh
create mode 100644 sig-pkg/utilities/packetsend/configure.ac
create mode 100755 sig-pkg/utilities/packetsqimport/autogen.sh
create mode 100644 sig-pkg/utilities/packetsqimport/configure.ac
create mode 100755 sse-pkg/autogen.sh
create mode 100644 sse-pkg/configure.ac
create mode 100644 sse-pkg/m4/ax_ext_have_lib.m4
create mode 100755 tclreadline/autogen.sh
create mode 100644 tclreadline/configure.ac
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment