[SCM] epr-api branch, master, updated. debian/2.2-1-37-gaee81eb

Antonio Valentino antonio.valentino at tiscali.it
Thu Aug 15 19:02:41 UTC 2013


The following commit has been merged in the master branch:
commit c8f9e2444519a3d77a576bcb04f95060ec36102e
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Thu Aug 15 18:11:04 2013 +0000

    Remove all patches (applied upstream)

diff --git a/debian/changelog b/debian/changelog
index 058055a..8ef0f02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
+epr-api (2.3~dev20130815-1) UNRELEASED; urgency=low
 
   * New upstream snapshot
   * Standard version bumped to 3.9.4 (no changes)
+  * Compat have been set to 9
+  * Removed all patches (applied upstream)
   * The -dev package has been renamed from libepr-api2-dev into libepr-api-dev
   * Now the -dev package also provides a static version of the library
   * debian/control
@@ -17,14 +19,6 @@ epr-api (2.3~dev20130813-1) UNRELEASED; urgency=low
   * debian/copyright
     - use versioned copyright format uri
     - updated dates in copyright statements
-  * debian/patches
-    - patches regenerated with gbp-pq
-    - fix-build-flags.patch and spelling.patch patches have been removed
-      because applied upstream
-    - new patch for generating the static library
-    - new patch for setting the SOVERSION
-    - new patch for fixing missing linkage with libm
-  * Set compat to 9
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Tue, 13 Aug 2013 15:20:14 +0000
 
diff --git a/debian/patches/0001-static-lib.patch b/debian/patches/0001-static-lib.patch
deleted file mode 100644
index fd30101..0000000
--- a/debian/patches/0001-static-lib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 17 Mar 2012 18:57:06 +0100
-Subject: static lib
-
----
- makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/makefile b/makefile
-index 6824a71..0a9bdd0 100644
---- a/makefile
-+++ b/makefile
-@@ -118,6 +118,9 @@ clean:
- ###############################################
- 
- 
-+$(OUTDIR)/libepr_api.a : $(OBJECTS)
-+	$(AR) rcs $@ $(OBJECTS)
-+
- $(TARGET) : $(OBJECTS)
- 	$(LINK) $(LDFLAGS) -o $@ $(OBJECTS) -lm -lc
- 
diff --git a/debian/patches/0002-Set-SOVERSION.patch b/debian/patches/0002-Set-SOVERSION.patch
deleted file mode 100644
index baf369e..0000000
--- a/debian/patches/0002-Set-SOVERSION.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Tue, 13 Aug 2013 17:21:11 +0000
-Subject: Set SOVERSION
-
----
- src/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f1e9540..9af5837 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -24,6 +24,10 @@ set(SOURCES epr_api.c
- 
- # targets
- add_library(epr_api SHARED ${SOURCES})
-+set_target_properties(epr_api PROPERTIES
-+    VERSION "${EPR_API_VERSION_MAJOR}.${EPR_API_VERSION_MINOR}.${EPR_API_VERSION_PATCH}"
-+    SOVERSION ${EPR_API_VERSION_MAJOR})
-+
- 
- if(BUILD_STATIC_LIB)
-     add_library(epr_api_static STATIC ${SOURCES})
diff --git a/debian/patches/0003-Add-missing-link-target.patch b/debian/patches/0003-Add-missing-link-target.patch
deleted file mode 100644
index 19a9e5c..0000000
--- a/debian/patches/0003-Add-missing-link-target.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Tue, 13 Aug 2013 17:47:13 +0000
-Subject: Add missing link target
-
----
- src/CMakeLists.txt      | 1 +
- src/test/CMakeLists.txt | 1 -
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9af5837..d09178d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -27,6 +27,7 @@ add_library(epr_api SHARED ${SOURCES})
- set_target_properties(epr_api PROPERTIES
-     VERSION "${EPR_API_VERSION_MAJOR}.${EPR_API_VERSION_MINOR}.${EPR_API_VERSION_PATCH}"
-     SOVERSION ${EPR_API_VERSION_MAJOR})
-+target_link_libraries(epr_api m)
- 
- 
- if(BUILD_STATIC_LIB)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index d33d6f5..ca3a5fa 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -30,4 +30,3 @@ endif(${BIGENDIAN})
- add_test(TEST_EPR_03 epr_test_endian)
- set_tests_properties(TEST_EPR_03 PROPERTIES PASS_REGULAR_EXPRESSION
-     ${ENDIANESS})
--
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b63010f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-0001-static-lib.patch
-0002-Set-SOVERSION.patch
-0003-Add-missing-link-target.patch

-- 
ENVISAT Product Reader API for C



More information about the Pkg-grass-devel mailing list