rev 13896 - in kde-extras/kscope/trunk/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Fri Feb 27 10:22:06 UTC 2009 

Author: fabo
Date: 2009-02-27 10:22:05 +0000 (Fri, 27 Feb 2009)
New Revision: 13896

Added:
   kde-extras/kscope/trunk/debian/kscope.desktop
   kde-extras/kscope/trunk/debian/patches/01_fix_install_path.diff
   kde-extras/kscope/trunk/debian/patches/02_set_debian_qscintilla_path.diff
   kde-extras/kscope/trunk/debian/patches/03_fix_createindex_call.diff
Removed:
   kde-extras/kscope/trunk/debian/docs
   kde-extras/kscope/trunk/debian/kscope.xml
   kde-extras/kscope/trunk/debian/patches/02_autotools_update.diff
   kde-extras/kscope/trunk/debian/patches/03_libtool_update.diff
   kde-extras/kscope/trunk/debian/patches/04_am_maintainer_mode.diff
   kde-extras/kscope/trunk/debian/patches/05_pedantic-errors.diff
   kde-extras/kscope/trunk/debian/patches/06_disable_no_undefined.diff
   kde-extras/kscope/trunk/debian/patches/10_kdepot.diff
   kde-extras/kscope/trunk/debian/patches/11_load_default_config.diff
   kde-extras/kscope/trunk/debian/patches/98_buildprep.diff
Modified:
   kde-extras/kscope/trunk/debian/changelog
   kde-extras/kscope/trunk/debian/compat
   kde-extras/kscope/trunk/debian/control
   kde-extras/kscope/trunk/debian/copyright
   kde-extras/kscope/trunk/debian/patches/series
   kde-extras/kscope/trunk/debian/rules
Log:
Kscope 1.9.2 changes

  * New upstream release:
    - code rewrite using Qt 4 only.
  * Remove all previous patches. Deprecated.
  * Add patches:
    - 01_fix_install_path.diff
      Use INSTALL_PATH=/usr instead of /usr/local prefix.
    - 02_set_debian_qscintilla_path.diff
      QScintilla on Debian uses /usr/include/qt4/Qsci include path.
    - 03_fix_createindex_call.diff
      Fix error: call of overloaded 'createIndex(int&, int&, NULL)'
      is ambiguous.
  * Bump compat to 7.
  * Update Section field: use devel.
  * Update build dependencies:
    - Remove previous build-depends. Deprecated
    - Add libqt4-dev and libqscintilla2-dev.
  * Rewrite descriptions as kscope isn't a KDE application anymore.
  * Update copyright: kscope is licensed under GPL-2+ now.
  * Remove docs file. Deprecated.
  * Add kscope.desktop file.
  * Remove kscope manpage. Deprecated.
  * Rewrite rules file. Use debhelper.


Modified: kde-extras/kscope/trunk/debian/changelog
===================================================================
--- kde-extras/kscope/trunk/debian/changelog	2009-02-27 10:17:27 UTC (rev 13895)
+++ kde-extras/kscope/trunk/debian/changelog	2009-02-27 10:22:05 UTC (rev 13896)
@@ -1,3 +1,30 @@
+kscope (1.9.2-1) unstable; urgency=low
+
+  * New upstream release:
+    - code rewrite using Qt 4 only.
+  * Remove all previous patches. Deprecated.
+  * Add patches:
+    - 01_fix_install_path.diff
+      Use INSTALL_PATH=/usr instead of /usr/local prefix.
+    - 02_set_debian_qscintilla_path.diff
+      QScintilla on Debian uses /usr/include/qt4/Qsci include path.
+    - 03_fix_createindex_call.diff
+      Fix error: call of overloaded 'createIndex(int&, int&, NULL)'
+      is ambiguous.
+  * Bump compat to 7.
+  * Update Section field: use devel.
+  * Update build dependencies:
+    - Remove previous build-depends. Deprecated
+    - Add libqt4-dev and libqscintilla2-dev.
+  * Rewrite descriptions as kscope isn't a KDE application anymore.
+  * Update copyright: kscope is licensed under GPL-2+ now.
+  * Remove docs file. Deprecated.
+  * Add kscope.desktop file.
+  * Remove kscope manpage. Deprecated.
+  * Rewrite rules file. Use debhelper.
+
+ -- Fathi Boudra <fabo at debian.org>  Fri, 27 Feb 2009 00:14:00 +0100
+
 kscope (1.6.2-1) unstable; urgency=low
 
   * New upstream release (bugfix release).

Modified: kde-extras/kscope/trunk/debian/compat
===================================================================
--- kde-extras/kscope/trunk/debian/compat	2009-02-27 10:17:27 UTC (rev 13895)
+++ kde-extras/kscope/trunk/debian/compat	2009-02-27 10:22:05 UTC (rev 13896)
@@ -1 +1 @@
-5
+7

Modified: kde-extras/kscope/trunk/debian/control
===================================================================
--- kde-extras/kscope/trunk/debian/control	2009-02-27 10:17:27 UTC (rev 13895)
+++ kde-extras/kscope/trunk/debian/control	2009-02-27 10:22:05 UTC (rev 13896)
@@ -1,10 +1,9 @@
 Source: kscope
-Section: kde
+Section: devel
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), quilt, automake, bison, flex,
- kdebase-dev, docbook2x
+Build-Depends: quilt, debhelper (>= 7), libqt4-dev, libqscintilla2-dev
 Standards-Version: 3.8.0
 Homepage: http://kscope.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/kscope/?op=log
@@ -12,10 +11,11 @@
 
 Package: kscope
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags, graphviz
-Description: source editing environment for KDE
- KScope is a KDE front-end to Cscope. It provides a source-editing environment
- for large C projects. KScope is focused on source editing and analysis.
+Depends: ${shlibs:Depends}, ${misc:Depends}, cscope, exuberant-ctags
+Description: source browsing and editing environment
+ KScope is a graphical front-end to Cscope. It provides a source browsing and
+ editing environment for large C projects. KScope is focused on source editing
+ and analysis.
  .
  KScope is built around an efficient mechanism for code-navigation, which
  allows the user to run queries on the code.
@@ -33,7 +33,7 @@
  to open an editor at the matching line.
  .
  Main Features:
-  * Multiple editor windows (using your favourite KDE editor)
+  * Multiple editor windows (using your favourite editor)
   * Project management
   * Front-end to most Cscope queries
   * Tag list for every open editor

Modified: kde-extras/kscope/trunk/debian/copyright
===================================================================
--- kde-extras/kscope/trunk/debian/copyright	2009-02-27 10:17:27 UTC (rev 13895)
+++ kde-extras/kscope/trunk/debian/copyright	2009-02-27 10:22:05 UTC (rev 13896)
@@ -1,62 +1,40 @@
-This package was debianized by Fathi Boudra <fboudra at free.fr> on
-Tue, 11 Apr 2006 11:44:04 +0200.
+This package was debianized by:
 
-It was downloaded from http://kscope.sourceforge.net
+    Fathi Boudra <fboudra at free.fr> on Tue, 11 Apr 2006 11:44:04 +0200
 
-Copyright Holder: Elad Lahav <elad_lahav at users.sf.net>
+It was downloaded from:
 
-The kscope manpage is © 2006 Jonathan Patrick Davies <jpatrick at ubuntu.com>
-and is licensed under the GPL, see below.
+    http://kscope.sourceforge.net
 
-manpage license:
+Upstream Author:
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+    Elad Lahav <elad_lahav at users.sourceforge.net>
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+Copyright:
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+    © 2007-2009 Elad Lahav <elad_lahav at users.sourceforge.net>
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
+License:
 
-kscope license:
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-On Debian systems, the complete text of the BSD License can be 
-found in `/usr/share/common-licenses/BSD'.
+The Debian packaging is:
 
-The documentations provided with kscope is distributed under
-the GNU Free Documentation License (FDL). They are considered free with
-regards to the Debian Free Software Guidelines (DFSG) because they don't
-contain any unmodifiable parts (invariant sections).
+    Copyright (C) 2006-2009, Fathi Boudra <fabo at debian.org>
 
-On Debian systems, the complete text of the GNU Free Documentation
-License can be found in `/usr/share/common-licenses/GFDL'.
+and is licensed under the GPL, see above.

Deleted: kde-extras/kscope/trunk/debian/docs

Added: kde-extras/kscope/trunk/debian/kscope.desktop
===================================================================
--- kde-extras/kscope/trunk/debian/kscope.desktop	                        (rev 0)
+++ kde-extras/kscope/trunk/debian/kscope.desktop	2009-02-27 10:22:05 UTC (rev 13896)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=KScope
+Exec=kscopeapp
+Icon=kscope
+Type=Application
+Terminal=false
+Comment=Source editing environment
+Comment[fr]=Editeur de code source
+GenericName=Source editing environment
+GenericName[fr]=Editeur de code source
+Categories=Qt;Development;

Deleted: kde-extras/kscope/trunk/debian/kscope.xml

Added: kde-extras/kscope/trunk/debian/patches/01_fix_install_path.diff
===================================================================
--- kde-extras/kscope/trunk/debian/patches/01_fix_install_path.diff	                        (rev 0)
+++ kde-extras/kscope/trunk/debian/patches/01_fix_install_path.diff	2009-02-27 10:22:05 UTC (rev 13896)
@@ -0,0 +1,11 @@
+--- a/config
++++ b/config
+@@ -5,7 +5,7 @@
+ # Change this value to the installation root path.
+ # Executables will be installed under INSTALL_PATH/bin, libraries under
+ # INSTALL_PATH/lib, etc.
+-INSTALL_PATH = /usr/local
++INSTALL_PATH = /usr
+ 
+ # The root path of the QScintilla installation.
+ # KScope expects to find QScintilla's include files under 

Deleted: kde-extras/kscope/trunk/debian/patches/02_autotools_update.diff

Added: kde-extras/kscope/trunk/debian/patches/02_set_debian_qscintilla_path.diff
===================================================================
--- kde-extras/kscope/trunk/debian/patches/02_set_debian_qscintilla_path.diff	                        (rev 0)
+++ kde-extras/kscope/trunk/debian/patches/02_set_debian_qscintilla_path.diff	2009-02-27 10:22:05 UTC (rev 13896)
@@ -0,0 +1,22 @@
+--- a/app/app.pro
++++ b/app/app.pro
+@@ -51,7 +51,7 @@ FORMS += querydialog.ui \
+     configenginesdialog.ui \
+     openprojectdialog.ui
+ INCLUDEPATH += .. \
+-    $${QSCI_ROOT_PATH}/include/Qsci \
++    $${QSCI_ROOT_PATH}/include/qt4/Qsci \
+     .
+ LIBS += -L../core \
+     -lkscope_core \
+--- a/editor/editor.pro
++++ b/editor/editor.pro
+@@ -19,7 +19,7 @@ SOURCES += lexerstylemodel.cpp \
+     configdialog.cpp \
+     findtextdialog.cpp
+ INCLUDEPATH += .. \
+-    $${QSCI_ROOT_PATH}/include/Qsci \
++    $${QSCI_ROOT_PATH}/include/qt4/Qsci \
+     .
+ LIBS += -L../core \
+     -lkscope_core \

Added: kde-extras/kscope/trunk/debian/patches/03_fix_createindex_call.diff
===================================================================
--- kde-extras/kscope/trunk/debian/patches/03_fix_createindex_call.diff	                        (rev 0)
+++ kde-extras/kscope/trunk/debian/patches/03_fix_createindex_call.diff	2009-02-27 10:22:05 UTC (rev 13896)
@@ -0,0 +1,13 @@
+Fix error: call of overloaded 'createIndex(int&, int&, NULL)' is ambiguous
+
+--- a/core/locationlistmodel.cpp
++++ b/core/locationlistmodel.cpp
+@@ -207,7 +207,7 @@ QModelIndex LocationListModel::index(int
+ 	if (row < 0 || row >= locList_.size())
+ 		return QModelIndex();
+ 
+-	return createIndex(row, column, NULL);
++	return createIndex(row, column, 0);
+ }
+ 
+ /**

Deleted: kde-extras/kscope/trunk/debian/patches/03_libtool_update.diff

Deleted: kde-extras/kscope/trunk/debian/patches/04_am_maintainer_mode.diff

Deleted: kde-extras/kscope/trunk/debian/patches/05_pedantic-errors.diff

Deleted: kde-extras/kscope/trunk/debian/patches/06_disable_no_undefined.diff

Deleted: kde-extras/kscope/trunk/debian/patches/10_kdepot.diff

Deleted: kde-extras/kscope/trunk/debian/patches/11_load_default_config.diff

Deleted: kde-extras/kscope/trunk/debian/patches/98_buildprep.diff

Modified: kde-extras/kscope/trunk/debian/patches/series
===================================================================
--- kde-extras/kscope/trunk/debian/patches/series	2009-02-27 10:17:27 UTC (rev 13895)
+++ kde-extras/kscope/trunk/debian/patches/series	2009-02-27 10:22:05 UTC (rev 13896)
@@ -1,8 +1,3 @@
-02_autotools_update.diff
-03_libtool_update.diff
-04_am_maintainer_mode.diff
-05_pedantic-errors.diff
-06_disable_no_undefined.diff
-10_kdepot.diff
-11_load_default_config.diff
-98_buildprep.diff
+01_fix_install_path.diff
+02_set_debian_qscintilla_path.diff
+03_fix_createindex_call.diff

Modified: kde-extras/kscope/trunk/debian/rules
===================================================================
--- kde-extras/kscope/trunk/debian/rules	2009-02-27 10:17:27 UTC (rev 13895)
+++ kde-extras/kscope/trunk/debian/rules	2009-02-27 10:22:05 UTC (rev 13896)
@@ -1,27 +1,63 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-DEB_INSTALL_MANPAGES_kscope := kscope.1
+include /usr/share/quilt/quilt.make
 
-build/kscope::
-	/usr/bin/docbook2x-man debian/kscope.xml
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
+	dh_testdir
 
-install/kscope::
-	install -D -p -m0644 src/kscope.desktop \
-	  debian/kscope/usr/share/applications/kde/kscope.desktop
+	qmake-qt4 && $(MAKE)
 
-binary-post-install/kscope::
-	rm -rf debian/kscope/usr/share/applnk/
+	touch $@
 
-clean::
-	rm -f kscope.1
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
 
-get-orig-source-dpatch:
-	@@dh_testdir
-	@@[ -d ../tarballs/. ]
-	@@dpatch-get-origtargz ../tarballs
+	[ ! -f Makefile ] || $(MAKE) distclean
 
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	$(MAKE) INSTALL_ROOT=$(CURDIR)/debian/kscope install
+	install -D -p -m 0644 debian/kscope.desktop \
+		$(CURDIR)/debian/kscope/usr/share/applications/kscope.desktop
+	install -D -p -m 0644 app/images/kscope.png \
+		$(CURDIR)/debian/kscope/usr/share/icons/hicolor/32x32/apps/kscope.png
+	rm -f $(CURDIR)/debian/kscope/usr/lib/*.so
+
+# 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 ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	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

More information about the pkg-kde-commits mailing list