[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:35:55 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2fae82f
The following commit has been merged in the master branch:
commit 2fae82f7b76eedb18289842598375f8a14be0505
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Fri Jan 16 02:59:53 2004 +0000
Renamed C++ files to *.hpp and *.cpp
---
src/Makefile | 33 ++++++++++++++++-----------------
src/{exif.cc => exif.cpp} | 6 +++---
src/{exif.h => exif.hpp} | 4 ++--
src/{exiftest.cc => exiftest.cpp} | 2 +-
src/{tags.cc => tags.cpp} | 4 ++--
src/{tags.h => tags.hpp} | 2 +-
src/{utils.cc => utils.cpp} | 2 +-
src/{utils.h => utils.hpp} | 0
src/{utiltest.cc => utiltest.cpp} | 2 +-
9 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 1ac9829..13bc8b8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@
#
# RCS information
# $Name: $
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
# Description:
# Do NOT change this file! All system specific settings and configs
@@ -40,10 +40,10 @@ include $(top_srcdir)/config.mk
CCHDR =
# Add library C++ source files to this list
-CCSRC = exif.cc tags.cc utils.cc
+CCSRC = exif.cpp tags.cpp utils.cpp
# Add source files of applications to this list
-BINSRC = exiftest.cc
+BINSRC = exiftest.cpp
# **********************************************************************
# Library
@@ -64,23 +64,23 @@ LDLIBS = $(LIBS) -l$(LIBNAME)
SHELL = /bin/sh
.SUFFIXES:
-.SUFFIXES: .cc .o .so
+.SUFFIXES: .cpp .o .so
-.PRECIOUS: %.cc
+.PRECIOUS: %.cpp
# Generic variables
-CCHDR := $(CCHDR) $(CCSRC:.cc=.h)
-CCOBJ = $(CCSRC:.cc=.o)
-CCSOBJ = $(CCSRC:.cc=.so)
+CCHDR := $(CCHDR) $(CCSRC:.cpp=.hpp)
+CCOBJ = $(CCSRC:.cpp=.o)
+CCSOBJ = $(CCSRC:.cpp=.so)
SRC = $(CCSRC)
HDR = $(CCHDR)
OBJ = $(CCOBJ)
SOBJ = $(CCSOBJ)
-DEP = $(CCSRC:%.cc=.%.d) $(BINSRC:%.cc=.%.d)
+DEP = $(CCSRC:%.cpp=.%.d) $(BINSRC:%.cpp=.%.d)
-BINOBJ = $(BINSRC:.cc=.o)
-BINARY = $(BINSRC:.cc=)
+BINOBJ = $(BINSRC:.cpp=.o)
+BINARY = $(BINSRC:.cpp=)
ARCHIVE = lib$(LIBNAME)$(ARCHIVE_SUFFIX)
SHAREDLIB = lib$(LIBNAME)$(SHAREDLIB_SUFFIX)
@@ -119,20 +119,20 @@ endif
# **********************************************************************
# Rules
-%.o: %.cc
+%.o: %.cpp
$(CXX) $(CXXFLAGS_STATIC) $(CXXDEFS) $(CXXINCS) -c $< -o $@
-%.so: %.cc
+%.so: %.cpp
$(CXX) $(CXXFLAGS_SHARED) $(CXXDEFS) $(CXXINCS) -c $< -o $@
-%.ii: %.cc
+%.ii: %.cpp
set -e; \
$(CXXCPP) $(CPPFLAGS) $(CXXDEFS) $(CXXINCS) $< \
| sed '/^[ ]*$$/d' > $@
# generate a makefile with the prerequisites for each source file
# (see `info make' for details)
-.%.d: %.cc
+.%.d: %.cpp
@echo generating $@
@set -e; \
$(CXXDEP) $(CPPFLAGS) $(CXXDEFS) $(CXXINCS) $< \
@@ -230,7 +230,7 @@ check:
mostlyclean:
$(RM) core
- $(RM) $(CCSRC:.cc=.ii)
+ $(RM) $(CCSRC:.cpp=.ii)
$(RM) $(OBJ) $(SOBJ) $(BINOBJ)
@if test -n "$(CXX_REPOSITORY)"; then \
echo "rm -rf $(CXX_REPOSITORY)"; \
@@ -251,4 +251,3 @@ distclean: clean
# This command is intended for maintainers to use; it deletes files
# that may need special tools to rebuild.
maintainer-clean: uninstall uninstall-lib distclean
- rm -rf $(top_srcdir)/html/*
diff --git a/src/exif.cc b/src/exif.cpp
similarity index 99%
rename from src/exif.cc
rename to src/exif.cpp
index e8c3149..ae140c6 100644
--- a/src/exif.cc
+++ b/src/exif.cpp
@@ -12,12 +12,12 @@
RCS information
$Name: $
- $Revision: 1.3 $
+ $Revision: 1.1 $
*/
// *****************************************************************************
// included header files
-#include "exif.h"
-#include "tags.h"
+#include "exif.hpp"
+#include "tags.hpp"
// + standard includes
#include <iostream>
diff --git a/src/exif.h b/src/exif.hpp
similarity index 99%
rename from src/exif.h
rename to src/exif.hpp
index 9b1e0c3..610d152 100644
--- a/src/exif.h
+++ b/src/exif.hpp
@@ -8,7 +8,7 @@
/*!
@file exif.h
@brief Encoding and decoding of %Exif data
- @version $Name: $ $Revision: 1.3 $
+ @version $Name: $ $Revision: 1.1 $
@author Andreas Huggel (ahu)
@date 09-Jan-03, ahu: created
*/
@@ -17,7 +17,7 @@
// *****************************************************************************
// included header files
-#include "tags.h"
+#include "tags.hpp"
// + standard includes
#include <string>
diff --git a/src/exiftest.cc b/src/exiftest.cpp
similarity index 98%
rename from src/exiftest.cc
rename to src/exiftest.cpp
index 9c4162b..1e87ffd 100644
--- a/src/exiftest.cc
+++ b/src/exiftest.cpp
@@ -1,4 +1,4 @@
-#include "exif.h"
+#include "exif.hpp"
#include <iostream>
#include <iomanip>
diff --git a/src/tags.cc b/src/tags.cpp
similarity index 99%
rename from src/tags.cc
rename to src/tags.cpp
index 1c3fe9b..5d728aa 100644
--- a/src/tags.cc
+++ b/src/tags.cpp
@@ -12,11 +12,11 @@
RCS information
$Name: $
- $Revision: 1.2 $
+ $Revision: 1.1 $
*/
// *****************************************************************************
// included header files
-#include "tags.h"
+#include "tags.hpp"
// + standard includes
diff --git a/src/tags.h b/src/tags.hpp
similarity index 99%
rename from src/tags.h
rename to src/tags.hpp
index 4233bb0..95d300c 100644
--- a/src/tags.h
+++ b/src/tags.hpp
@@ -8,7 +8,7 @@
/*!
@file tags.h
@brief %Exif tag and type information
- @version $Name: $ $Revision: 1.2 $
+ @version $Name: $ $Revision: 1.1 $
@author Andreas Huggel (ahu)
@date 15-Jan-03, ahu: created
*/
diff --git a/src/utils.cc b/src/utils.cpp
similarity index 99%
rename from src/utils.cc
rename to src/utils.cpp
index 1ba0edf..0d4e1c3 100644
--- a/src/utils.cc
+++ b/src/utils.cpp
@@ -28,7 +28,7 @@
// *********************************************************************
// included header files
-#include "utils.h"
+#include "utils.hpp"
// + standard includes
#include <sys/types.h>
diff --git a/src/utils.h b/src/utils.hpp
similarity index 100%
rename from src/utils.h
rename to src/utils.hpp
diff --git a/src/utiltest.cc b/src/utiltest.cpp
similarity index 99%
rename from src/utiltest.cc
rename to src/utiltest.cpp
index 87a5425..c208864 100644
--- a/src/utiltest.cc
+++ b/src/utiltest.cpp
@@ -11,7 +11,7 @@
// *********************************************************************
// included header files
-#include "utils.h"
+#include "utils.hpp"
#include <iostream>
#include <iomanip>
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list