[graphite2] 60/69: Imported Debian patch 1.3.5-1~deb8u1
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit 758ff064202dbe21ec4abbba2d35b3defe64cb51
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jan 24 11:17:48 2016 +0100
Imported Debian patch 1.3.5-1~deb8u1
---
debian/changelog | 9 +++------
debian/control | 12 +++++++-----
debian/libgraphite2-2.0.0.shlibs | 1 -
...n-overrides => libgraphite2-3-dbg.lintian-overrides} | 0
...ibgraphite2-2.0.0.install => libgraphite2-3.install} | 0
debian/libgraphite2-3.links | 2 ++
...ntian-overrides => libgraphite2-3.lintian-overrides} | 0
debian/libgraphite2-3.shlibs | 1 +
debian/patches/revert-to-old-SONAME.diff | 17 -----------------
debian/patches/series | 1 -
debian/rules | 6 +++---
11 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4ec6a48..83195e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,9 @@
-graphite2 (1.3.5-1~deb7u1) oldstable-security; urgency=high
+graphite2 (1.3.5-1~deb8u1) stable-security; urgency=high
- * rebuild for oldstable-security
+ * rebuild for stable-security
* revert ddeb-migration
- * revert package rename to -3 and go back to -2.0.0 to avoid changing
- the package name (ABI compatibility is there). Also dd patch to revert
- back to .so.2.0.0 as SONAME.
- -- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2016 09:33:18 +0000
+ -- Rene Engelhard <rene@debian.org> Sun, 24 Jan 2016 11:17:48 +0100
graphite2 (1.3.5-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ace369b..fe00609 100644
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,14 @@ Build-Depends: debhelper (>= 9), dh-exec (>= 0.3), dpkg-dev (>= 1.16.1~), cmake,
Build-Depends-Indep: asciidoc, dblatex, doxygen, docbook-xsl, latex-xcolor, libxml2-utils, graphviz
Standards-Version: 3.9.6
-Package: libgraphite2-2.0.0
+Package: libgraphite2-3
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Provides: libgraphite2-3
+Provides: libgraphite2-2.0.0
+Replaces: libgraphite2-2.0.0
+Breaks: libgraphite2-2.0.0 (<< 1.2.0)
Multi-Arch: same
Description: Font rendering engine for Complex Scripts -- library
Graphite is a system that can be used to create and use "smart fonts" capable
@@ -39,7 +41,7 @@ Description: Font rendering engine for Complex Scripts -- library
Package: libgraphite2-dev
Section: libdevel
Architecture: any
-Depends: libgraphite2-2.0.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libgraphite2-3 (= ${binary:Version}), ${misc:Depends}
Description: Development files for libgraphite2
Graphite is a system that can be used to create and use "smart fonts" capable
of displaying writing systems with various complex behaviors, such as:
@@ -60,11 +62,11 @@ Description: Development files for libgraphite2
.
This package contains the development libraries for libgraphite2
-Package: libgraphite2-2.0.0-dbg
+Package: libgraphite2-3-dbg
Priority: extra
Section: debug
Architecture: any
-Depends: libgraphite2-2.0.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libgraphite2-3 (= ${binary:Version}), ${misc:Depends}
Description: Debug symbols for libgraphite2
Graphite is a system that can be used to create and use "smart fonts" capable
of displaying writing systems with various complex behaviors, such as:
diff --git a/debian/libgraphite2-2.0.0.shlibs b/debian/libgraphite2-2.0.0.shlibs
deleted file mode 100644
index cbf5aec..0000000
--- a/debian/libgraphite2-2.0.0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libgraphite2 3 libgraphite2-2.0.0
diff --git a/debian/libgraphite2-2.0.0-dbg.lintian-overrides b/debian/libgraphite2-3-dbg.lintian-overrides
similarity index 100%
rename from debian/libgraphite2-2.0.0-dbg.lintian-overrides
rename to debian/libgraphite2-3-dbg.lintian-overrides
diff --git a/debian/libgraphite2-2.0.0.install b/debian/libgraphite2-3.install
similarity index 100%
rename from debian/libgraphite2-2.0.0.install
rename to debian/libgraphite2-3.install
diff --git a/debian/libgraphite2-3.links b/debian/libgraphite2-3.links
new file mode 100755
index 0000000..e6784d8
--- /dev/null
+++ b/debian/libgraphite2-3.links
@@ -0,0 +1,2 @@
+#! /usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.3 usr/lib/${DEB_HOST_MULTIARCH}/libgraphite2.so.2.0.0
diff --git a/debian/libgraphite2-2.0.0.lintian-overrides b/debian/libgraphite2-3.lintian-overrides
similarity index 100%
rename from debian/libgraphite2-2.0.0.lintian-overrides
rename to debian/libgraphite2-3.lintian-overrides
diff --git a/debian/libgraphite2-3.shlibs b/debian/libgraphite2-3.shlibs
new file mode 100644
index 0000000..90ae7f3
--- /dev/null
+++ b/debian/libgraphite2-3.shlibs
@@ -0,0 +1 @@
+libgraphite2 3 libgraphite2-3 (>= 1.2.2)
diff --git a/debian/patches/revert-to-old-SONAME.diff b/debian/patches/revert-to-old-SONAME.diff
deleted file mode 100644
index 614e47e..0000000
--- a/debian/patches/revert-to-old-SONAME.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- graphite2/src/CMakeLists.txt-old 2016-01-26 10:07:00.154163999 +0100
-+++ graphite2/src/CMakeLists.txt 2016-01-26 10:08:28.667467827 +0100
-@@ -24,11 +24,11 @@
- cmake_policy(SET CMP0012 NEW)
- INCLUDE(CheckCXXSourceCompiles)
-
--set(GRAPHITE_API_CURRENT 3)
-+set(GRAPHITE_API_CURRENT 2)
- set(GRAPHITE_API_REVISION 0)
--set(GRAPHITE_API_AGE 1)
-+set(GRAPHITE_API_AGE 0)
- set(GRAPHITE_VERSION ${GRAPHITE_API_CURRENT}.${GRAPHITE_API_REVISION}.${GRAPHITE_API_AGE})
--set(GRAPHITE_SO_VERSION ${GRAPHITE_API_CURRENT})
-+set(GRAPHITE_SO_VERSION ${GRAPHITE_API_CURRENT}.${GRAPHITE_API_REVISION}.${GRAPHITE_API_AGE})
-
- include(TestBigEndian)
-
diff --git a/debian/patches/series b/debian/patches/series
index a26311e..ba9444d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ non-linux.diff
no-icons.diff
test-timeout.diff
reproducible-build.diff
-revert-to-old-SONAME.diff
diff --git a/debian/rules b/debian/rules
index 1c6d56c..b361477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/dpkg/architecture.mk
dh $@ --builddirectory=build
override_dh_strip:
- dh_strip --dbg-package=libgraphite2-2.0.0-dbg
+ dh_strip --dbg-package=libgraphite2-3-dbg
override_dh_auto_build-arch:
dh_auto_build --parallel
@@ -24,7 +24,7 @@ override_dh_auto_build-indep:
# mono-xbuild NGraphite.sln
override_dh_auto_install:
- if [ -f ./build/src/libgraphite2.so.2.0.0 ]; then \
+ if [ -f ./build/src/libgraphite2.so.3 ]; then \
dh_auto_install; \
else \
dh_install -plibgraphite2-doc --sourcedir=$(CURDIR); \
@@ -39,7 +39,7 @@ override_dh_auto_install:
# find debian/libtext-gr2-perl -type f -name .packlist | xargs rm -f
override_dh_auto_test:
- if [ -f ./build/src/libgraphite2.so.2.0.0 ]; then \
+ if [ -f ./build/src/libgraphite2.so.3 ]; then \
dh_auto_test; \
fi
#ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: