Skip to content

Commit

Permalink
Convert Subversion references to git
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Nordholts committed Apr 25, 2009
1 parent 5f81acb commit 64cbf62
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 42 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
@@ -1,3 +1,12 @@
2009-04-24 Martin Nordholts <martinn@src.gnome.org>

Convert Subversion references to git

* HACKING
* INSTALL
* README.i18n
* autogen.sh

2009-04-24 Martin Nordholts <martinn@src.gnome.org>

* README: Update link to GTK+ themes in README. Patch from
Expand Down
55 changes: 21 additions & 34 deletions HACKING
Expand Up @@ -23,15 +23,15 @@ Beta software can be found at alpha.gnu.org.
- ftp://ftp.gnome.org/pub/GNOME/sources/libxslt/1.1/

These are only the additional requirements if you want to compile from
the Subversion repository. The file INSTALL lists the various libraries
we depend on.
the git repository. The file INSTALL lists the various libraries we
depend on.


Compilation
-----------
If you are accessing gimp via Subversion, then you will need to take
several steps to get it to compile. You can do all these steps at once
by running:
If you are accessing gimp via git, then you will need to take several
steps to get it to compile. You can do all these steps at once by
running:

gimp/trunk$ ./autogen.sh

Expand Down Expand Up @@ -67,23 +67,17 @@ disable the support for gtk-doc so you will not be able to generate
the API documentation.


Subversion
Git
----------
GIMP is available from GNOME Subversion. You can use the following
commands to get them from the anonymous Subversion server:
GIMP is available from GNOME Git. You can use the following commands
to get GIMP from the the git server:

For getting GIMP trunk, use:
$ git clone git://git.gnome.org/gimp

$ svn co http://svn.gnome.org/svn/gimp/trunk gimp
You can read more on using GNOME's git service at these URLs:

For getting a GIMP branch, use:

$ svn co http://svn.gnome.org/svn/gimp/branches/<branch> gimp-<branch>

You can read more on using GNOME's Subversion service at these URLs:

http://developer.gnome.org/tools/svn.html
http://svnbook.red-bean.com/
http://live.gnome.org/Git
http://www.kernel.org/pub/software/scm/git/docs/


You will also need relatively new stable releases of glib, pango, atk,
Expand All @@ -94,26 +88,19 @@ part of recent Linux distribution releases.
Patches
-------

The best way to submit patches is to file a bug report at
The best way to submit patches is to publish your git repository and
ask developers to git-fetch from you.

For bug fixes where the patch is small you can file a bug report at
http://bugzilla.gnome.org/ and attach your patch to it as a plain text
file, not compressed. If your patch is reasonably small you can submit
it to the gimp-developer@lists.xcf.berkeley.edu mailing list. If the
patch needs to be discussed, you should also consider using the
it to the gimp-developer@lists.xcf.berkeley.edu mailing list. You can
create the patch file with git-format-patch

If the patch needs to be discussed, you should also consider using the
mailing list instead of Bugzilla because bug reports tend to be hard
to read if they contain too many comments. For the code, please try to
follow the guidelines given in Hackordnung, below. You can create the
patch file with "svn diff", preferably in an annotated patch format.
This can be achieved with ~/.subversion/config containing a custom
diff command in the [helpers] section:

[helpers]
diff-cmd = /usr/local/bin/_svndiff

And create an executable script in /usr/local/bin/_svndiff with the
following contents:

#!/bin/sh
/usr/bin/diff -up --label "${3}" ${6} --label "${5}" ${7}
follow the guidelines given in Hackordnung, below.


Auto-generated Files
Expand Down
8 changes: 4 additions & 4 deletions INSTALL
Expand Up @@ -35,11 +35,11 @@ header files installed.
http://ftp.gnome.org/pub/gnome/sources/intltool/

3. You need to have GEGL version 0.0.18 or newer and babl version
0.0.22 or newer. You can get it from http://gegl.org/ or check
it out from the subversion repository:
0.0.22 or newer. You can get them from http://gegl.org/ or clone
them from the GNOME git repository:

http://svn.gnome.org/svn/babl/trunk
http://svn.gnome.org/svn/gegl/trunk
git://git.gnome.org/babl
git://git.gnome.org/gegl

4. You need to have installed GTK+ version 2.14.4 or newer. GIMP
also need a recent versions of GLib (>= 2.18.0) and Pango (>= 1.20.1).
Expand Down
2 changes: 1 addition & 1 deletion README.i18n
Expand Up @@ -27,7 +27,7 @@ GIMP is different
po-tips/gimp20-tips.pot -- the startup tips

If you are looking for the translations of gimp-perl, please note that
gimp-perl has been moved into it's own Subversion module called
gimp-perl has been moved into it's own git module called
gimp-perl.


Expand Down
6 changes: 3 additions & 3 deletions autogen.sh
@@ -1,7 +1,7 @@
#!/bin/sh

# This script does all the magic calls to automake/autoconf and friends
# that are needed to configure a Subversion checkout. As described in
# This script does all the magic calls to automake/autoconf and
# friends that are needed to configure a git clone. As described in
# the file HACKING you need a couple of extra tools to run this script
# successfully.
#
Expand Down Expand Up @@ -73,7 +73,7 @@ check_version ()

echo
echo "I am testing that you have the tools required to build the"
echo "$PROJECT from Subversion. This test is not foolproof,"
echo "$PROJECT from git. This test is not foolproof,"
echo "so if anything goes wrong, see the file HACKING for more information..."
echo

Expand Down

0 comments on commit 64cbf62

Please sign in to comment.