Replaced obsolete references to CVS and SourceForge.

Also, switched links to https: where available.

diff --git a/.gitignore b/.gitignore
index 6eed8a4..924ef73 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -59,5 +59,4 @@ stamp-h.in
 conftest
 conftest.c
 ABOUT-NLS
-ChangeLog.cvs
-cvs2cl.usermap
+ChangeLog.git

diff --git a/Makefile.am b/Makefile.am
index ed10b68..9a3de9d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,36 +19,27 @@ doc_DATA = README AUTHORS NEWS ChangeLog ABOUT-NLS COPYING
 #
 
 # Simulate something like
-#   EXTRA_DIST_IF_EXIST = ChangeLog.cvs
-# If present, ship ChangeLog.cvs in source tarball.
+#   EXTRA_DIST_IF_EXIST = ChangeLog.git
+# If present, ship ChangeLog.git in source tarball.
 # If not present, don't ship it.
 dist-hook:
-       if test -f $(srcdir)/ChangeLog.cvs; then \
-               cp -p $(srcdir)/ChangeLog.cvs $(distdir)/ChangeLog.cvs; \
+       if test -f $(srcdir)/ChangeLog.git; then \
+               cp -p $(srcdir)/ChangeLog.git $(distdir)/ChangeLog.git; \
        fi
 
-.PHONY: cvs-changelog
-cvs-changelog: $(srcdir)/ChangeLog.cvs
+.PHONY: git-changelog
+git-changelog: $(srcdir)/ChangeLog.git
 
-.PHONY: $(srcdir)/ChangeLog.cvs
-$(srcdir)/ChangeLog.cvs:
-       if test -f "$(srcdir)/cvs2cl.usermap"; then \
-               usermap="--usermap ./cvs2cl.usermap"; \
-       else \
-               usermap=""; \
-       fi; \
-       (cd "$(srcdir)" && cvs2cl $${usermap} --utc --domain users.sourceforge.net -f "ChangeLog.cvs")
+.PHONY: $(srcdir)/ChangeLog.git
+$(srcdir)/ChangeLog.git:
+       (cd "$(srcdir)" && git2cl > $@)
 
-.PHONY: cvs-tag-release
-cvs-tag-release:
+.PHONY: git-tag-release
+git-tag-release:
        @tag="$$(echo "$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-release" | sed 's|\.|_|g')"; \
-       echo "Are you sure you want to CVS tag \`$${tag}' your source files?"; \
+       echo "Are you sure you want to git tag \`$${tag}' your source files?"; \
        echo "Press Ctrl-C to abort, Enter to continue."; \
        read; \
-       cd "$(srcdir)" && cvs tag "$${tag}"
-
-.PHONY: upload-release
-upload-release:
-       echo ncftpput upload.sourceforge.net incoming/ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).*
+       cd "$(srcdir)" && git tag "$${tag}"
 
 # End of Makefile.am.

diff --git a/README b/README
index 13683cc..5b5ea39 100644 (file)
--- a/README
+++ b/README
@@ -37,7 +37,7 @@ USAGE
 -----
 
 We have documented the libexif API using doxygen and are making
-the results available at http://libexif.sourceforge.net/api/
+the results available at https://libexif.github.io/api/
 
 The short test programs in the test directory illustrates how to create
 valid EXIF data from scratch, how to save EXIF data and how to load EXIF
@@ -47,7 +47,7 @@ us at <libexif-devel@lists.sourceforge.net> if you have any questions
 on how to use libexif.
 
 To link to libexif into your own package, we recommend using the
-pkgconfig utility (cf. http://www.freedesktop.org/wiki/Software/pkg-config/ For
+pkgconfig utility (cf. https://www.freedesktop.org/wiki/Software/pkg-config/ For
 your convenience, libexif both provides libexif-uninstalled.pc and
 installs libexif.pc.
 
@@ -55,18 +55,18 @@ installs libexif.pc.
 FRONTENDS
 ---------
 
-Right now, I know of the following frontends to libexif:
+Here are a few frontends to libexif:
  - exif:     A small command-line utility to show EXIF information in JPEG
-             files (http://www.sourceforge.net/projects/libexif).
+             files (https://github.com/libexif/libexif).
  - gexif:    A GTK+ frontend for editing EXIF data
-             (http://www.sourceforge.net/projects/libexif).
- - gphoto2:  A command-line frontend to libgphoto2, a library to access a 
+             (https://github.com/libexif/gexif).
+ - gphoto2:  A command-line frontend to libgphoto2, a library to access a
              wide range of digital cameras (http://www.gphoto.org).
  - gtkam:    A GTK+ frontend to libgphoto2 (http://www.gphoto.org).
  - thirdeye: Digital photos organizer and driver for eComStation
              (http://ecomstation.ru/thirdeye).
  - digikam:  digital photo management application for KDE
-             (http://www.digikam.org/)
+             (https://www.digikam.org/)
 
 If you would like to migrate your program to use libexif or add EXIF support
 to it, don't hesitate to contact the authors.
@@ -75,10 +75,10 @@ to it, don't hesitate to contact the authors.
 LIBRARIES
 ---------
 
-I know of the following libraries that use or have been inspired by libexif:
+The following libraries use or have been inspired by libexif:
  - libexif-gtk: library of widgets to help display EXIF tags in GTK
-   programs (part of the libexif project)
- - pel: PHP-Code (http://pel.sourceforge.net)
+   programs (https://github.com/libexif/libexif-gtk).
+ - pel: PHP-Code (https://github.com/lsolesen/pel/)
 
 
 BUILDING
@@ -91,7 +91,7 @@ to build. Building from the source tar ball usually involves the commands:
   make
   sudo make install
 
-When building from source out of CVS, something like the following will be
+When building from source out of git, something like the following will be
 necessary:
 
   gettextize
@@ -135,7 +135,7 @@ INTERNATIONALIZATION
 The libexif translations are made by volunteers working on their own,
 either directly with the libexif project or through one of two translation
 coordination sites, the Translation Project
-<http://translationproject.org/domain/libexif.html> and Launchpad
+<https://translationproject.org/domain/libexif.html> and Launchpad
 <https://translations.edge.launchpad.net/ubuntu/precise/+source/libexif/+pots/libexif-12>.
 Any updates to language translations coordinated by the Translation Project
 must be made through their web site, but all other languages can be
@@ -168,7 +168,7 @@ LINKS
 Some links you might want to check out if you are interested in further
 information about EXIF.
 
- - http://drewnoakes.com/code/exif: metadata extraction framework in Java
- - http://www.exif.org: information about the EXIF standard.
- - http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/index.html: Looks
+ - https://drewnoakes.com/code/exif: metadata extraction framework in Java
+ - https://www.exif.org: information about the EXIF standard.
+ - https://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/index.html: Looks
    like libexif in Perl. Seems to support a lot of MakerNotes.

diff --git a/configure.ac b/configure.ac
index f9d7538..3826696 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,21 +10,6 @@ AM_MAINTAINER_MODE
 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
 AM_SILENT_RULES([no])
 
-if test ! -d "$srcdir/m4m"; then
-AC_MSG_ERROR([
-You are missing the m4m/ directory in your top
-$PACKAGE_TARNAME source directory.
-
-You are probably using an ill-maintained CVS tree.
-Running
-
-    cd $srcdir
-    cvs co m4m
-
-and re-running autogen.sh might help.
-])
-fi
-
 GP_CHECK_SHELL_ENVIRONMENT
 GP_CONFIG_MSG([Build])
 GP_CONFIG_MSG([Source code location],[${srcdir}])

diff --git a/doc/footer.html b/doc/footer.html
index 52ba8ab..dd88ecd 100644 (file)
--- a/doc/footer.html
+++ b/doc/footer.html
@@ -2,9 +2,7 @@
 
 <hr size="1">
 <address style="text-align: right;">
-<a href="http://sourceforge.net" title="Hosted by SourceForge.net" target="_top">
-<img src="http://sourceforge.net/sflogo.php?group_id=12272&amp;type=1"
-width="88" height="31" border="0" align="top" alt="SourceForge.net Logo" /></a>
+<a href="https://libexif.github.io" target="_top">libexif</a>
 
 <small>Generated by&nbsp;<a href="http://www.doxygen.org/" target="_top"><img src="doxygen.png" alt="doxygen" align="middle" border="0">
 </a>

diff --git a/libexif.spec.in b/libexif.spec.in
index 48930b1..2dbedc6 100644 (file)
--- a/libexif.spec.in
+++ b/libexif.spec.in
@@ -2,8 +2,8 @@ Name: @PACKAGE@
 Summary: EXIF tag library
 Version: @VERSION@
 Release: 1
-Source: http://prdownloads.sourceforge.net/libexif/%{name}-%{version}.tar.bz2
-Url: http://sourceforge.net/projects/libexif/
+Source: https://prdownloads.sourceforge.net/libexif/%{name}-%{version}.tar.bz2
+Url: https://libexif.github.io/
 Group: System Environment/Libraries
 License: LGPL
 # replaced Packager: header, as most people making packages will be somebody