[SCM] libopenshot/master: Switch from git-dpm to gbp
ghisvail-guest at users.alioth.debian.org
ghisvail-guest at users.alioth.debian.org
Tue Jun 13 10:55:27 UTC 2017
The following commit has been merged in the master branch:
commit 03e1c3b5607e50497221de3df63aa2255c324371
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue Jun 13 10:05:32 2017 +0100
Switch from git-dpm to gbp
- Drop git-dpm configuration
- Unapply the patch queue
- Add gbp configuration
- Refresh the patch queue
- Drop patch numbering
Gbp-Dch: Full
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35055a0..1de241a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,10 +49,10 @@ list (GET OPENSHOT_VERSION_LINES 2 LINE_BUILD)
list (GET OPENSHOT_VERSION_LINES 3 LINE_SO)
#### Get the version number out of each line
-STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MAJOR[ ]+([0-9]+);(.*)" "\\1" MAJOR_VERSION "${LINE_MAJOR}")
-STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MINOR[ ]+([0-9]+);(.*)" "\\1" MINOR_VERSION "${LINE_MINOR}")
-STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_BUILD[ ]+([0-9]+);(.*)" "\\1" BUILD_VERSION "${LINE_BUILD}")
-STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_SO[ ]+([0-9]+);(.*)" "\\1" SO_VERSION "${LINE_SO}")
+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MAJOR.*([0-9])+;(.*)" "\\1" MAJOR_VERSION "${LINE_MAJOR}")
+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_MINOR.*([0-9])+;(.*)" "\\1" MINOR_VERSION "${LINE_MINOR}")
+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_BUILD.*([0-9])+;(.*)" "\\1" BUILD_VERSION "${LINE_BUILD}")
+STRING(REGEX REPLACE "#define[ ]+OPENSHOT_VERSION_SO.*([0-9])+;(.*)" "\\1" SO_VERSION "${LINE_SO}")
set(PROJECT_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${BUILD_VERSION}")
MESSAGE("--> MAJOR Version: ${MAJOR_VERSION}")
@@ -84,4 +84,4 @@ add_subdirectory(tests)
include(cmake/Modules/UseDoxygen.cmake)
file(GLOB_RECURSE doc_files ${CMAKE_CURRENT_BINARY_DIR}/doc/html/*.*)
-INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot)
+INSTALL(FILES ${doc_files} DESTINATION share/doc/libopenshot)
\ No newline at end of file
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index fbfd554..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-3b15844bdc708db4c6e6b3d6f83cb0bc240a1ec7
-3b15844bdc708db4c6e6b3d6f83cb0bc240a1ec7
-2f2a1992294bd8b9d7e225a37cf59fb4c62476ce
-2f2a1992294bd8b9d7e225a37cf59fb4c62476ce
-libopenshot_0.1.3+ds1.orig.tar.gz
-c5f9c4f46eacfafc6605394a096b26dc4c6b9e08
-10214545
-debianTag="debian/%e%v"
-patchedTag="patched/%e%v"
-upstreamTag="upstream/%e%u"
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f53906f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+sign-tags = True
+pristine-tar = True
diff --git a/debian/patches/0003-Capture-multi-digit-version-numbers.patch b/debian/patches/Capture-multi-digit-version-numbers.patch
similarity index 96%
rename from debian/patches/0003-Capture-multi-digit-version-numbers.patch
rename to debian/patches/Capture-multi-digit-version-numbers.patch
index 36abacb..0a5a667 100644
--- a/debian/patches/0003-Capture-multi-digit-version-numbers.patch
+++ b/debian/patches/Capture-multi-digit-version-numbers.patch
@@ -1,4 +1,3 @@
-From 3b15844bdc708db4c6e6b3d6f83cb0bc240a1ec7 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at users.noreply.github.com>
Date: Sat, 28 Jan 2017 17:32:39 +0000
Subject: Capture multi-digit version numbers
diff --git a/debian/patches/0002-disable-failing-tests.patch b/debian/patches/Disable-failing-tests.patch
similarity index 90%
rename from debian/patches/0002-disable-failing-tests.patch
rename to debian/patches/Disable-failing-tests.patch
index 6a98d43..1dbf60a 100644
--- a/debian/patches/0002-disable-failing-tests.patch
+++ b/debian/patches/Disable-failing-tests.patch
@@ -1,7 +1,6 @@
-From 0dd01afe165a6216133075b333ebcc7905fde6e5 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Fri, 16 Dec 2016 13:30:35 +0000
-Subject: disable failing tests
+Subject: Disable failing tests
https://github.com/OpenShot/libopenshot/issues/43
---
diff --git a/debian/patches/0001-use-system-libjsoncpp.patch b/debian/patches/Use-system-libjsoncpp.patch
similarity index 89%
rename from debian/patches/0001-use-system-libjsoncpp.patch
rename to debian/patches/Use-system-libjsoncpp.patch
index 3a26114..4bf8c3b 100644
--- a/debian/patches/0001-use-system-libjsoncpp.patch
+++ b/debian/patches/Use-system-libjsoncpp.patch
@@ -1,7 +1,6 @@
-From b3c64005d5e4dd28dde2b4039268b6d94b22a8f8 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Thu, 15 Dec 2016 21:04:34 +0000
-Subject: use system libjsoncpp
+Subject: Use system libjsoncpp
---
tests/CMakeLists.txt | 8 +++++++-
diff --git a/debian/patches/series b/debian/patches/series
index 95d5b11..93a2f2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-0001-use-system-libjsoncpp.patch
-0002-disable-failing-tests.patch
-0003-Capture-multi-digit-version-numbers.patch
+Use-system-libjsoncpp.patch
+Disable-failing-tests.patch
+Capture-multi-digit-version-numbers.patch
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5d8b101..29fbe45 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -152,13 +152,7 @@ include_directories(${ZMQ_INCLUDE_DIRS})
################### JSONCPP #####################
# Include jsoncpp headers (needed for JSON parsing)
-if (USE_SYSTEM_JSONCPP)
- find_package(JsonCpp REQUIRED)
- include_directories(${JSONCPP_INCLUDE_DIRS})
-else ()
- message("Using embedded JsonCpp")
- include_directories("../thirdparty/jsoncpp/include")
-endif ()
+include_directories("../thirdparty/jsoncpp/include")
IF (NOT DISABLE_TESTS)
############### SET TEST SOURCE FILES #################
diff --git a/tests/FFmpegWriter_Tests.cpp b/tests/FFmpegWriter_Tests.cpp
index 3480fb7..99cee7b 100644
--- a/tests/FFmpegWriter_Tests.cpp
+++ b/tests/FFmpegWriter_Tests.cpp
@@ -73,8 +73,8 @@ TEST(FFmpegWriter_Test_Webm)
int pixel_index = 112 * 4; // pixel 112 (4 bytes per pixel)
// Check image properties on scanline 10, pixel 112
- //CHECK_EQUAL(23, (int)pixels[pixel_index]);
- //CHECK_EQUAL(23, (int)pixels[pixel_index + 1]);
- //CHECK_EQUAL(23, (int)pixels[pixel_index + 2]);
- //CHECK_EQUAL(255, (int)pixels[pixel_index + 3]);
+ CHECK_EQUAL(23, (int)pixels[pixel_index]);
+ CHECK_EQUAL(23, (int)pixels[pixel_index + 1]);
+ CHECK_EQUAL(23, (int)pixels[pixel_index + 2]);
+ CHECK_EQUAL(255, (int)pixels[pixel_index + 3]);
}
--
libopenshot packaging
More information about the pkg-multimedia-commits
mailing list