[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.2.1-5-14-g88ca124
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Wed May 21 23:05:42 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=88ca124
The following commit has been merged in the experimental branch:
commit 88ca124be3409da7d95bae66dc1ca8bcd53bc853
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Wed May 21 20:05:16 2014 -0300
Mark private symbols at build time.
---
debian/changelog | 4 ++++
debian/mark_private_symbols.sh | 15 +++++++++++++--
debian/rules | 2 ++
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4e0a473..c8dbd26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,10 @@ qtdeclarative-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
* Remove qml modules transitional packages. They have already landed in
testing and they never existed in stable, so it's safe to remove them.
* Mark private symbols as such.
+ * Mark private symbols at build time and produce a diff so as to be able to
+ get the changes from build logs.
+ - Modify mark_private_symbols.sh.
+ - Run mark_private_symbols.sh from debian/rules.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Mon, 05 May 2014 23:50:25 -0300
diff --git a/debian/mark_private_symbols.sh b/debian/mark_private_symbols.sh
index 3041c48..2360130 100755
--- a/debian/mark_private_symbols.sh
+++ b/debian/mark_private_symbols.sh
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-PRIVATE_HEADERS=qtdeclarative5-private-dev/usr/include
+PRIVATE_HEADERS=debian/qtdeclarative5-private-dev/usr/include
error() {
echo $@
@@ -36,6 +36,12 @@ then
error "Private headers not found"
fi
+# Create a backup copy of the original symbols file.
+for symbols_file in `ls debian/*.symbols`
+do
+ cp $symbols_file $symbols_file.orig
+done
+
grep -rh class ${PRIVATE_HEADERS} |
grep EXPORT |
while read class export classname rest
@@ -45,6 +51,11 @@ grep -rh class ${PRIVATE_HEADERS} |
while read privateclass
do
debug marking ${privateclass} as private
- sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/ 1/" *.symbols
+ sed -i "s/\(.*${privateclass}[^ ]* *[^ ]*\)$/ 1/" debian/*.symbols
done
+# Diff the symbols files and output it's differences.
+for symbols_file in `ls debian/*.symbols`
+do
+ diff -Nau $symbols_file $symbols_file.orig
+done
diff --git a/debian/rules b/debian/rules
index ee1707a..1f30ba0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,8 @@ override_dh_auto_install-indep:
override_dh_install:
dh_install --fail-missing
+ # Mark private symbols as such. Be verbose.
+ DEBUG=1 debian/mark_private_symbols.sh
override_dh_builddeb:
dh_builddeb -- -Zxz
--
qtdeclarative packaging
More information about the pkg-kde-commits
mailing list