Create debian package, use Qt >= 4.6

CMakeLists.txt

@@ -20,7 +20,7 @@ message( STATUS "PACKAGE_NAME = ${PACKAGE_STRING}")
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/cmake)
 
-find_package( Qt4 4.7.0 COMPONENTS QtCore QtGui QtNetwork QtWebkit QtXml QtXmlPatterns REQUIRED )
+find_package( Qt4 4.6.0 COMPONENTS QtCore QtGui QtNetwork QtWebkit QtXml QtXmlPatterns REQUIRED )
 find_package( QScintilla )
 find_package( LibXML2 )
 

debian/changelog

@@ -0,0 +1,5 @@
+fb2edit (0.0.3-squeeze1) quantal; urgency=low
+
+  * Alpha-test release.
+
+ -- Denis Kandrashin <mail@lintest.ru>  Sun, 08 Jul 2012 18:53:27 +0400

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,16 @@
+Source: fb2edit
+Section: x11
+Priority: optional
+Maintainer: Kandrashin Denis <mail@lintest.ru>
+Build-Depends: debhelper (>= 7), cmake, libqt4-dev (>= 4.6), libxml2-dev
+Standards-Version: 3.8.0
+Homepage: http://fb2edit.lintest.ru
+
+Package: fb2edit
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Application for editing FB2 e-books files.
+ fb2eidt — свободная (бесплатная и открытая) программа 
+ для редактирования электронных книг формата fb2. 
+ .
+ http://fb2edit.lintest.ru

debian/copyright

@@ -0,0 +1,22 @@
+This package was debianized by Kandrashin Denis <mail@lintest.ru>
+
+It was downloaded from: http://fb2edit.lintest.ru
+
+Upstream Author: 
+
+    Kandrashin Denis <mail@lintest.ru>
+
+Copyright:
+
+    The Debian packaging is copyright (c) 2012 
+    by Kandrashin Denis, Moscow, Russia
+
+License:
+
+    GPLv3
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.

debian/menu

@@ -0,0 +1,2 @@
+?package(fb2edit):needs="x11" section="Applications/Viewers" \
+	title="FB2 e-book editor" command="fb2edit"

debian/rules

@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	cmake . -DCMAKE_INSTALL_PREFIX=/usr 
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp  
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE)
+	#docbook-to-man debian/myrulib.sgml > myrulib.1
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -rf CMakeFiles
+	rm -f CMakeCache.txt
+	rm -f cmake_install.cmake
+	rm -f qtc_*.cxx
+	rm -f ui_*.h
+	rm -f *.qm
+	rm -f fb2edit
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep  
+	dh_installdirs
+
+	# Add here commands to install the package into debian/myrulib.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/myrulib install
+
+
+# Build architecture-independent files here.
+binary-indep: install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: install
+	dh_testdir
+	dh_testroot
+#	dh_installchangelogs 
+#	dh_installdocs
+#	dh_installexamples
+	dh_install
+	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+#	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

rpmbuild/fb2edit.spec

@@ -13,16 +13,19 @@ License:        GPL-3.0
 Summary:        FB2 Files Editor
 URL:            http://fb2edit.lintest.ru
 Group:          Productivity/Text/Editors
-Source0:        http://www.lintest.ru/pub/%{name}-%{version}.tar.bz2
+Source0:        http://www.lintest.ru/pub/%{name}_%{version}.orig.tar.bz2
+Source90:       %{name}_%{version}-squeeze1.debian.tar.gz
+Source91:       %{name}_%{version}-squeeze1.dsc
+Source92:       %{name}_%{version}-squeeze1_source.changes
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  pkgconfig(QtCore) >= 4.7.0
-BuildRequires:  pkgconfig(QtGui) >= 4.7.0
-BuildRequires:  pkgconfig(QtNetwork) >= 4.7.0
-BuildRequires:  pkgconfig(QtWebKit) >= 4.7.0
-BuildRequires:  pkgconfig(QtXml) >= 4.7.0
+BuildRequires:  pkgconfig(QtCore) >= 4.6.0
+BuildRequires:  pkgconfig(QtGui) >= 4.6.0
+BuildRequires:  pkgconfig(QtNetwork) >= 4.6.0
+BuildRequires:  pkgconfig(QtWebKit) >= 4.6.0
+BuildRequires:  pkgconfig(QtXml) >= 4.6.0
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -101,6 +104,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
+%doc AUTHORS LICENSE
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/%{name}.png

source/fb2head.cpp

@@ -425,13 +425,6 @@ QVariant Fb2HeadModel::headerData(int section, Qt::Orientation orientation, int
     return QVariant();
 }
 
-void Fb2HeadModel::select(const QModelIndex &index)
-{
-    Fb2HeadItem *node = item(index);
-    if (!node || node->id().isEmpty()) return;
-    m_view.page()->mainFrame()->scrollToAnchor(node->id());
-}
-
 void Fb2HeadItem::setText(const QString &text)
 {
     m_text = text;

source/fb2head.hpp

@@ -129,7 +129,6 @@ class Fb2HeadModel: public QAbstractItemModel
 public:
     explicit Fb2HeadModel(QWebView &view, QObject *parent = 0);
     virtual ~Fb2HeadModel();
-    void select(const QModelIndex &index);
     void expand(QTreeView *view);
     Fb2HeadItem * item(const QModelIndex &index) const;
     QModelIndex append(const QModelIndex &parent, const QString &name);