Control: tag -1 + patch
Control: user release.debian....@packages.debian.org
Control: usertag -1 + transition
Control: block -1 by 790756
Control: reassign -1 release.debian.org
Proposed patch attached.
--
Eugene V. Lyubimkin aka JackYF, JID: jackyf(maildog)jabber.fsfe.org
C++ GNU/Linux userspace developer, Debian Developer
diff --git a/debian/changelog b/debian/changelog
index 55c2f28..1faecad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+fbreader (0.12.10dfsg-10) unstable; urgency=low
+
+ * NMU acknowledged - thanks, OndÅej!
+ * debian/control:
+ - Bump ABI parts of libzlcore and libzltext package names for GCC5 C++11
+ ABI transition. For historical reasons these package name parts were
+ actually a bit off the SONAMEs, and now it's a good time to fix it.
+ (Closes: #763468)
+
+ -- Eugene V. Lyubimkin <jac...@debian.org> Tue, 21 Jul 2015 20:52:34 +0300
+
fbreader (0.12.10dfsg-9.1) unstable; urgency=medium
* Change B-D to libjpeg-dev to finish the transition to libjpeg-turbo
diff --git a/debian/control b/debian/control
index 10872e4..9a22a3c 100644
--- a/debian/control
+++ b/debian/control
@@ -34,10 +34,12 @@ Description: e-book reader
* searching and downloading books from www.feedbooks.com and www.litres.ru
* partial CSS support for epub files
-Package: libzlcore0.12
+Package: libzlcore0.13
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore-data (>= ${source:Version})
+Breaks: libzlcore0.12
+Replaces: libzlcore0.12
Conflicts: fbreader-gtk, fbreader-qt, fbreader-qt4
Description: ZLibrary cross-platform development library (shared library)
This is the core of ZLibrary, the library that the fbreader e-book reader
@@ -59,11 +61,13 @@ Description: ZLibrary cross-platform development library (support files)
ZLibrary is a cross-platform library to build applications running on desktop
Linux, Windows, different Linux-based PDAs using this library.
-Package: libzltext0.12
+Package: libzltext0.13
Section: libs
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.12 (= ${binary:Version}),
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version}),
libzltext-data (>= ${source:Version})
+Breaks: libzltext0.12
+Replaces: libzltext0.12
Description: ZLibrary text model/viewer part (shared library)
This package provides text model/viewer part of ZLibrary. See also
libzlcore0.10 package.
@@ -87,7 +91,7 @@ Description: ZLibrary text model/viewer part (support files)
Package: libzlui-gtk
Section: libs
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.12 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version})
Suggests: ttf-unifont
Description: GTK+ interface module for ZLibrary
This package provides a GTK+-based UI for ZLibrary.
@@ -98,7 +102,7 @@ Description: GTK+ interface module for ZLibrary
Package: libzlui-qt4
Section: libs
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.12 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version})
Description: Qt4 interface module for ZLibrary
This package provides a Qt4-based UI for ZLibrary.
.
@@ -108,7 +112,7 @@ Description: Qt4 interface module for ZLibrary
Package: libzlcore-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.12 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzlcore0.13 (= ${binary:Version})
Description: ZLibrary cross-platform development library (development files)
This package contains development files for the ZLibrary core.
.
@@ -118,7 +122,7 @@ Description: ZLibrary cross-platform development library (development files)
Package: libzltext-dev
Section: libdevel
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, libzltext0.12 (= ${binary:Version})
+Depends: ${misc:Depends}, ${shlibs:Depends}, libzltext0.13 (= ${binary:Version})
Description: ZLibrary text model/viewer part (development files)
This package contains development files for the ZLibrary text model/viewer
library.
diff --git a/debian/libzlcore0.12.dirs b/debian/libzlcore0.12.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libzlcore0.12.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libzlcore0.13.dirs b/debian/libzlcore0.13.dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/libzlcore0.13.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/libzltext0.12.dirs b/debian/libzltext0.12.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libzltext0.12.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libzltext0.13.dirs b/debian/libzltext0.13.dirs
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/libzltext0.13.dirs
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/rules b/debian/rules
index db5c6f2..af80cb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,10 +35,10 @@ install: build
dh install --before dh_auto_install
$(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/tmp do_install
mv $(DEB_DIR)/tmp/usr/share/zlibrary $(DEB_DIR)/libzlcore-data/usr/share
- mv $(DEB_DIR)/tmp/usr/lib $(DEB_DIR)/libzlcore0.12/usr/
+ mv $(DEB_DIR)/tmp/usr/lib $(DEB_DIR)/libzlcore0.13/usr/
$(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/tmp do_install
mv $(DEB_DIR)/tmp/usr/share/zlibrary $(DEB_DIR)/libzltext-data/usr/share
- mv $(DEB_DIR)/tmp/usr/lib $(DEB_DIR)/libzltext0.12/usr/
+ mv $(DEB_DIR)/tmp/usr/lib $(DEB_DIR)/libzltext0.13/usr/
$(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzlcore-dev do_install_dev
$(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy DESTDIR=$(DEB_DIR)/libzltext-dev do_install_dev
$(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=gtk DESTDIR=$(DEB_DIR)/libzlui-gtk do_install
@@ -52,8 +52,8 @@ binary-indep: binary-arch
binary-arch: build install
dh binary-arch --before dh_makeshlibs
- dh_makeshlibs -plibzlcore0.12
- dh_makeshlibs -plibzltext0.12
+ dh_makeshlibs -plibzlcore0.13
+ dh_makeshlibs -plibzltext0.13
dh binary-arch --after dh_makeshlibs
binary: binary-indep binary-arch
