diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e9f38e5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "wiki"] + path = wiki + url = https://alexander%40kojevnikov.com@code.google.com/p/spek.wiki diff --git a/dist/debian/control b/dist/debian/control index 0dafee8..8303600 100644 --- a/dist/debian/control +++ b/dist/debian/control @@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 7.0.50~), libpango1.0-dev Standards-Version: 3.9.2 Homepage: http://www.spek-project.org/ -Vcs-Git: git://gitorious.org/spek/spek.git -Vcs-Browser: http://gitorious.org/spek/spek +Vcs-Git: https://code.google.com/p/spek +Vcs-Browser: http://code.google.com/p/spek/source/browse Package: spek Architecture: any diff --git a/web/index.html b/web/index.html index 807cd39..c600aa9 100644 --- a/web/index.html +++ b/web/index.html @@ -112,7 +112,7 @@
Spek is free and open source software licensed under GNU GPL v3. The project is written in C and Vala, the code is hosted on Gitorious. Patches can be sent as Gitorious merge requests or attached to a new issue.
+Spek is free and open source software licensed under GNU GPL v3. The project is written in C and Vala, the code is hosted on Google Code.
Report bugs and request new features on the issue tracker.
Translation is done via Transifex. Don't hesitate to translate Spek into a new language or to improve existing translations.
diff --git a/wiki b/wiki new file mode 160000 index 0000000..ac553ee --- /dev/null +++ b/wiki @@ -0,0 +1 @@ +Subproject commit ac553ee399f3bbb2f6948fc01a3016b8cbe6aa99 diff --git a/wiki/OsxInstall.wiki b/wiki/OsxInstall.wiki deleted file mode 100644 index 7689739..0000000 --- a/wiki/OsxInstall.wiki +++ /dev/null @@ -1,35 +0,0 @@ -#labels Featured -= Mac OS X installation instructions = - -== Binary package == - -Spek for Mac OS X is available in the download section. Download and open the DMG package, then drag the Spek icon to Applications. - -Spek requires OS X 10.5 or 10.6 and an Intel-based Mac. - -== Building from the tarball == - -Spek can be built using packages from [http://www.macports.org/ MacPorts]. After [http://www.macports.org/install.php installing MacPorts] get these dependencies: - -{{{ -$ sudo port install intltool -$ sudo port install pango +no_x11 +quartz -$ sudo port install gtk2 +no_x11 +quartz -$ sudo port install ffmpeg +no_x11 +no_nonfree -$ sudo port install ige-mac-integration -}}} - -Then download the source code tarball and run these commands from terminal: - -{{{ -$ tar -xjvf spek-0.x.tar.bz2 -$ cd spek-0.x -$ ./configure -$ make -}}} - -To start Spek, run: - -{{{ -$ src/spek -}}} \ No newline at end of file diff --git a/wiki/Source.wiki b/wiki/Source.wiki deleted file mode 100644 index ad66075..0000000 --- a/wiki/Source.wiki +++ /dev/null @@ -1 +0,0 @@ -Spek source code is hosted on [http://gitorious.org/spek Gitorious]. \ No newline at end of file diff --git a/wiki/UnixInstall.wiki b/wiki/UnixInstall.wiki deleted file mode 100644 index abb73f4..0000000 --- a/wiki/UnixInstall.wiki +++ /dev/null @@ -1,59 +0,0 @@ -#labels Featured -= Unix installation instructions = - -== Binary packages == - -Spek is not yet packaged on many distributions, help in this area will be greatly appreciated. - - * *Arch Linux*: Use one of the packages in the AUR: [http://aur.archlinux.org/packages.php?ID=38001 spek] and [http://aur.archlinux.org/packages.php?ID=37252 spek-git]. - * *Debian*: [http://packages.debian.org/search?keywords=spek spek]. - * *Fedora*: [https://bugzilla.redhat.com/show_bug.cgi?id=597888 bug #597888]. - * *FreeBSD*: [http://www.freshports.org/audio/spek/ audio/spek]. - * *Gentoo*: [http://packages.gentoo.org/package/media-sound/spek media-sound/spek]. - * *Ubuntu*: [https://launchpad.net/~alexk/+archive/spek Official PPA]. - -== Ubuntu PPA == - -To install Spek from the [https://launchpad.net/~alexk/+archive/spek official PPA] on Ubuntu 10.10 (Maverick Meerkat) or Ubuntu 11.04 (Natty Narwhal) run these commands: - -{{{ -% sudo add-apt-repository ppa:alexk/spek -% sudo apt-get update -% sudo apt-get install spek -}}} - -== Building from the tarball == - -To build Spek, download the source code tarball then run these commands from terminal: - -{{{ -% tar -xjvf spek-0.x.tar.bz2 -% cd spek-0.x -% ./configure -% make -}}} - -To build you will need GTK+ and FFmpeg packages. On Debian/Ubuntu you also need development packages: libgtk2.0-dev, libavcodec-dev and libavformat-dev. - -To start Spek, run: - -{{{ -% src/spek -}}} - -Or install it with: - -{{{ -% sudo make install -}}} - -== Building from the git repository == - -{{{ -% git clone git://gitorious.org/spek/spek.git -% cd spek -% ./autogen.sh -% make -}}} - -In addition to the packages listed above, you will need autotools and the Vala compiler (normally packaged as valac). \ No newline at end of file diff --git a/wiki/WindowsInstall.wiki b/wiki/WindowsInstall.wiki deleted file mode 100644 index fafec73..0000000 --- a/wiki/WindowsInstall.wiki +++ /dev/null @@ -1,8 +0,0 @@ -#labels Featured -= Windows installation instructions = - -== Binary packages == - -Download section offers two packages: an MSI installer and a ZIP archive. To install Spek, download the MSI installer, double-click it and follow the instructions. - -If by some reason you don't want to use the installer, you can download the ZIP archive and unpack it somewhere on your disk. Spek executable is located under .\Spek\bin\spek.exe \ No newline at end of file