Commit 021340c7 authored by Samuel Thibault's avatar Samuel Thibault

New upstream release

Drop patches, merged upstream
parent 5f0240b5
gtg-trace (0.2-1) unstable; urgency=low
* New upstream release.
* patches/: Drop, merged upstream
-- Samuel Thibault <sthibault@debian.org> Tue, 24 Apr 2012 10:41:55 +0200
gtg-trace (0.1-2-1) unstable; urgency=low
* Initial release (Closes: #668218)
......
Index: gtg-trace/doc/Makefile.am
===================================================================
--- gtg-trace.orig/doc/Makefile.am 2012-04-20 18:24:35.546064540 +0200
+++ gtg-trace/doc/Makefile.am 2012-04-20 18:27:38.662152260 +0200
@@ -49,12 +49,12 @@ endif
# Crappy hack: automake cannot copy a directory, so we have to do it by hand.
install_html: $(DOX_TAG) $(DOX_HTML_DIR)/index.html
- mkdir -p $(htmldir)
- cp -r $(DOX_HTML_DIR) $(htmldir)
+ mkdir -p $(DESTDIR)$(htmldir)
+ cp -r $(DOX_HTML_DIR) $(DESTDIR)$(htmldir)
install_pdf: $(DOX_PDF)
- mkdir -p $(pdfdir)
- cp -r $(DOX_PDF) $(pdfdir)
+ mkdir -p $(DESTDIR)$(pdfdir)
+ cp -r $(DOX_PDF) $(DESTDIR)$(pdfdir)
if USE_PDFLATEX
install-data-am: install_pdf install_html
diff --git a/inc/GTGBasic1.h b/inc/GTGBasic1.h
index 5213b91..a25cadd 100644
--- a/inc/GTGBasic1.h
+++ b/inc/GTGBasic1.h
@@ -22,7 +22,7 @@
#define _TRACEGENERATORBASIC_
#include <stdlib.h>
#include <string.h>
-#include "types.h"
+#include "GTGtypes.h"
#include "GTGColor.h"
/**
diff --git a/inc/OTF_GTGBasic1.h b/inc/OTF_GTGBasic1.h
index 294d934..d14fafa 100644
--- a/inc/OTF_GTGBasic1.h
+++ b/inc/OTF_GTGBasic1.h
@@ -16,7 +16,7 @@
#ifndef _OTFTRACEGENERATORBASIC_
#define _OTFTRACEGENERATORBASIC_
-#include "types.h"
+#include "GTGtypes.h"
#include "GTGBasic1.h"
#include "OTF_Structs.h"
diff --git a/inc/OTF_Structs.h b/inc/OTF_Structs.h
index 9cdb539..8486549 100644
--- a/inc/OTF_Structs.h
+++ b/inc/OTF_Structs.h
@@ -18,7 +18,7 @@
#define _OTFSTRUCTS_
#include <stdint.h>
-#include "types.h"
+#include "GTGtypes.h"
/* ContainerTypes */
#define MAX_PROCESSTYPE 100
diff --git a/inc/paje_GTGBasic1.h b/inc/paje_GTGBasic1.h
index 3566e93..3350d7e 100644
--- a/inc/paje_GTGBasic1.h
+++ b/inc/paje_GTGBasic1.h
@@ -18,7 +18,7 @@
#define _PAJETRACEGENERATORBASIC_
#include "GTGBasic1.h"
-#include "types.h"
+#include "GTGtypes.h"
/**
* \brief Constant to create a paje trace
diff --git a/inc/types.h b/inc/types.h
deleted file mode 100644
index a401edd..0000000
--- a/inc/types.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * \file types.h
- * \version 0.1
- * \brief
- *
- * types define some types that are used in the library.
- *
- * \authors
- * Developpers are : \n
- * Francois Rue - francois.rue@labri.fr \n
- * Francois Trahay - francois.trahay@labri.fr \n
- * Johnny Jazeix - jazeix@enseirb-matmeca.fr \n
- * Kevin Coulomb - kevin.coulomb@gmail.com \n
- * Mathieu Faverge - faverge@labri.fr \n
- * Olivier Lagrasse - lagrasse@enseirb-matmeca.fr \n
- *
- */
-#ifndef _TYPES_LOC__
-#define _TYPES_LOC__
-/**
- * \defgroup type Types used
- */
-
-/**
- * \ingroup type Type used for time and value in C
- * \brief Use the double precision type for time and value.
- */
-typedef double varPrec;
-
-
-/**
- * \ingroup type Return values of functions
- * \enum trace_return_t
- * \brief Define various return values
- */
-typedef enum trace_return_t{
- TRACE_SUCCESS , /*!< Success of the call. */
- TRACE_ERR_OPEN , /*!< Failed to open files to write. */
- TRACE_ERR_CLOSE, /*!< Failed to close file. */
- TRACE_ERR_WRITE, /*!< Failed to write trace. */
- TRACE_ERR_NOT_IMPL /*!< Function not impleneted. */
-}trace_return_t;
-#endif
--- /dev/null
+++ b/inc/GTGtypes.h
@@ -0,0 +1,43 @@
+/**
+ * \file types.h
+ * \version 0.1
+ * \brief
+ *
+ * types define some types that are used in the library.
+ *
+ * \authors
+ * Developpers are : \n
+ * Francois Rue - francois.rue@labri.fr \n
+ * Francois Trahay - francois.trahay@labri.fr \n
+ * Johnny Jazeix - jazeix@enseirb-matmeca.fr \n
+ * Kevin Coulomb - kevin.coulomb@gmail.com \n
+ * Mathieu Faverge - faverge@labri.fr \n
+ * Olivier Lagrasse - lagrasse@enseirb-matmeca.fr \n
+ *
+ */
+#ifndef _TYPES_LOC__
+#define _TYPES_LOC__
+/**
+ * \defgroup type Types used
+ */
+
+/**
+ * \ingroup type Type used for time and value in C
+ * \brief Use the double precision type for time and value.
+ */
+typedef double varPrec;
+
+
+/**
+ * \ingroup type Return values of functions
+ * \enum trace_return_t
+ * \brief Define various return values
+ */
+typedef enum trace_return_t{
+ TRACE_SUCCESS , /*!< Success of the call. */
+ TRACE_ERR_OPEN , /*!< Failed to open files to write. */
+ TRACE_ERR_CLOSE, /*!< Failed to close file. */
+ TRACE_ERR_WRITE, /*!< Failed to write trace. */
+ TRACE_ERR_NOT_IMPL /*!< Function not impleneted. */
+}trace_return_t;
+#endif
diff --git a/inc/Makefile.am b/inc/Makefile.am
index f6fe42e..4056a1c 100644
--- a/inc/Makefile.am
+++ b/inc/Makefile.am
@@ -1,4 +1,4 @@
# Copyright CNRS, INRIA, Universit Bordeaux 1
# See COPYING in top-level directory.
-include_HEADERS = GTG.h GTGBasic1.h GTGColor.h OTF_GTGBasic1.h pajeColor.h paje_GTGBasic1.h types.h OTF_Structs.h
+include_HEADERS = GTG.h GTGBasic1.h GTGColor.h OTF_GTGBasic1.h pajeColor.h paje_GTGBasic1.h GTGtypes.h OTF_Structs.h
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment