rev 3368 - kde-extras/klibido/trunk/debian

Fathi Boudra fboudra-guest at costa.debian.org
Tue Mar 28 08:54:31 UTC 2006


Author: fboudra-guest
Date: 2006-03-28 08:54:30 +0000 (Tue, 28 Mar 2006)
New Revision: 3368

Added:
   kde-extras/klibido/trunk/debian/dirs
   kde-extras/klibido/trunk/debian/docs
   kde-extras/klibido/trunk/debian/klibido.1
   kde-extras/klibido/trunk/debian/manpages
   kde-extras/klibido/trunk/debian/menu
Removed:
   kde-extras/klibido/trunk/debian/autogen.sh
   kde-extras/klibido/trunk/debian/klibido.manpages
   kde-extras/klibido/trunk/debian/klibido.menu
   kde-extras/klibido/trunk/debian/man/
Modified:
   kde-extras/klibido/trunk/debian/changelog
   kde-extras/klibido/trunk/debian/control
   kde-extras/klibido/trunk/debian/copyright
   kde-extras/klibido/trunk/debian/rules
   kde-extras/klibido/trunk/debian/watch
Log:
Merge my changes for 0.2.5 before cdbs conversion

Deleted: kde-extras/klibido/trunk/debian/autogen.sh

Modified: kde-extras/klibido/trunk/debian/changelog
===================================================================
--- kde-extras/klibido/trunk/debian/changelog	2006-03-28 07:54:51 UTC (rev 3367)
+++ kde-extras/klibido/trunk/debian/changelog	2006-03-28 08:54:30 UTC (rev 3368)
@@ -1,22 +1,24 @@
 klibido (0.2.5-1) unstable; urgency=low
 
-  * change from libdb4.3++dev to libdb4.2++dev for bug #329439
+  * New upstream release (closes: #329439)
+  * Updated compat, control, copyright files
+  * Added dirs, docs, watch files
+  * Renamed klibido.manpages to manpages
+  * Renamed klibido.menu to menu
+  * Clean up rules
+  * Fixed common kde doc link
+  * Change from libdb4.3++dev to libdb4.2++dev for bug #329439
   * DEB_BUILD_OPTIONS can now be use to enable debug mode
-  export DEB_BUILD_OPTIONS=debug before starting the build process
-  * new upstream release (closes: #329439)
-  * build with config.guess and config.sub from Debian's autotools-dev
+    export DEB_BUILD_OPTIONS=debug before starting the build process
+  * Build with config.guess and config.sub from Debian's autotools-dev
     (closes: #329439)
-  * fixe: create a correct link to the documentation
-    (thanks to Fathi Boudra) 
-  * new watch file
-  * maintainer changed to Debian KDE Extras Team
-  * fix FTBFS with gcc4.1 (closes: #355986), thanks to  Martin Michlmayr
+  * Maintainer changed to Debian KDE Extras Team
+  * Fixed FTBFS with gcc4.1 thanks to Martin Michlmayr (closes: #355986)
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Wed,  8 Mar 2006 12:33:30 +0100
 
 klibido (0.2.4.1-1) unstable; urgency=low
 
-  * Initial Release.
-    (closes: Bug#298602)
+  * Initial Release (closes: Bug#298602)
 
  -- Gonéri Le Bouder <goneri at rulezlan.org>  Wed, 14 Sep 2005 21:09:59 +0000

Modified: kde-extras/klibido/trunk/debian/control
===================================================================
--- kde-extras/klibido/trunk/debian/control	2006-03-28 07:54:51 UTC (rev 3367)
+++ kde-extras/klibido/trunk/debian/control	2006-03-28 08:54:30 UTC (rev 3368)
@@ -2,19 +2,19 @@
 Section: news
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends:  c++-compiler, debhelper (>> 5.0.0), kdelibs4-dev, libuu-dev, libdb4.3++-dev, docbook-to-man, dpatch, autotools-dev, automake1.9
+Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
+Build-Depends: Build-Depends: debhelper (>= 5.0.0), autotools-dev, kdelibs4-dev, libuu-dev, libdb4.3++-dev
 Standards-Version: 3.6.2
 
 Package: klibido
 Architecture: any
-Depends: ${shlibs:Depends} 
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: usenet binary grabber for KDE
  KLibido is a KDE program to download encoded articles from the usenet news
  service, using the nntp protocol. It supports multiple servers, multiple
  download threads per server, automatic joining and decoding of articles.
  .
- KLibido is not a NewsReader. It doesn't let you easily display the articles -
+ KLibido is not a newsreader. It doesn't let you easily display the articles,
  only their subject, and it discards all non-binary posts. If you want a nice
  newsreader for KDE, try KNode.
  .
@@ -33,3 +33,5 @@
   - .nzb support
   - KLibido uses kde and the kde libraries for the interface, Berkeley DB for
     storing the newsgroups' headers, and UUDeview for decoding the posts.
+ .
+ Homepage: http://klibido.sourceforge.net

Modified: kde-extras/klibido/trunk/debian/copyright
===================================================================
--- kde-extras/klibido/trunk/debian/copyright	2006-03-28 07:54:51 UTC (rev 3367)
+++ kde-extras/klibido/trunk/debian/copyright	2006-03-28 08:54:30 UTC (rev 3368)
@@ -1,9 +1,33 @@
 This package was debianized by Gonéri Le Bouder on
 Tue, 15 Mar 2005 15:00:56 +0100.
 
-Original source can be found at: http://klibido.sf.net 
+It was downloaded from http://klibido.sf.net
 
-Upstream author is Alessandro "Bauno" Bonometti <bauno at inwind.it>
+Copyright Holder: Alessandro Bonometti <bauno at inwind.it>
 
-Licensed under the terms of GNU GPL.
-See /usr/share/common-licenses/GPL for details.
+Copyright for decoder/uudecoder:
+	Copyright (C) 2004 by David Pye <dmp at davidmpye.dyndns.org>
+
+Copyright for yydecoder:
+	Copyright (C) 2004 by David Pye <dmp at davidmpye.dyndns.org>
+	Copyright (C) 1995-1998 by Jean-Loup Gaily <jloup at gzip.org>
+	Copyright (C) 1995-1998 by Mark Adler <madler at alumni.caltech.edu>
+
+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.
+
+   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.
+
+   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
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+

Added: kde-extras/klibido/trunk/debian/dirs
===================================================================
--- kde-extras/klibido/trunk/debian/dirs	2006-03-28 07:54:51 UTC (rev 3367)
+++ kde-extras/klibido/trunk/debian/dirs	2006-03-28 08:54:30 UTC (rev 3368)
@@ -0,0 +1,9 @@
+usr/bin
+usr/share/applications/kde
+usr/share/apps/klibido/icons/hicolor/16x16/actions
+usr/share/apps/klibido/icons/hicolor/16x16/apps
+usr/share/apps/klibido/icons/hicolor/32x32/actions
+usr/share/apps/klibido/icons/hicolor/32x32/apps
+usr/share/doc/kde/HTML/en/klibido
+usr/share/icons/hicolor/16x16/apps
+usr/share/icons/hicolor/32x32/apps

Added: kde-extras/klibido/trunk/debian/docs
===================================================================
--- kde-extras/klibido/trunk/debian/docs	2006-03-28 07:54:51 UTC (rev 3367)
+++ kde-extras/klibido/trunk/debian/docs	2006-03-28 08:54:30 UTC (rev 3368)
@@ -0,0 +1,3 @@
+NEWS
+README
+TODO

Copied: kde-extras/klibido/trunk/debian/klibido.1 (from rev 3365, kde-extras/klibido/trunk/debian/man/klibido.1)

Deleted: kde-extras/klibido/trunk/debian/klibido.manpages

Deleted: kde-extras/klibido/trunk/debian/klibido.menu

Copied: kde-extras/klibido/trunk/debian/manpages (from rev 3365, kde-extras/klibido/trunk/debian/klibido.manpages)

Copied: kde-extras/klibido/trunk/debian/menu (from rev 3365, kde-extras/klibido/trunk/debian/klibido.menu)

Modified: kde-extras/klibido/trunk/debian/rules
===================================================================
--- kde-extras/klibido/trunk/debian/rules	2006-03-28 07:54:51 UTC (rev 3367)
+++ kde-extras/klibido/trunk/debian/rules	2006-03-28 08:54:30 UTC (rev 3368)
@@ -1,113 +1,66 @@
 #!/usr/bin/make -f
-#
-# debian/rules by Goneri Le Bouder <goneri at rulezlan.org>
-#
-# $Id: rules,v 1.1 2006-01-28 00:33:05 goneri Exp $
-#
-export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE  := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-CXXFLAGS = -Wall
+CFLAGS = -Wall -g
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-        CXXFLAGS += -O0 -g
-else
-        CONFFLAGS = --disable-debug
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-        CXXFLAGS += -O0
+	CFLAGS += -O0
 else
-        CXXFLAGS += -O3
+	CFLAGS += -O2
 endif
 
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-        CXXFLAGS += -g
-else
-        CXXFLAGS += -s
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
 endif
-endif
 
-
-configure:
-	#libtoolize --force --copy
-	chmod +x debian/autogen.sh
-	debian/autogen.sh
-
-configure-stamp: patch-stamp configure
+config.status: configure
 	dh_testdir
-	
-	ln -sf /usr/share/misc/config.sub admin
-	ln -sf /usr/share/misc/config.guess admin
-	rm -f config.cache
-	
-	$(checkdir)
-	CXXFLAGS="$(CXXFLAGS)" ./configure --prefix=/usr --disable-rpath $(CONFFLAGS) --enable-final
-	# Patch the generated libtool to avoid passing -rpath when linking,
-	# and to explicitly link libraries against the libraries they
-	# depend on.
-	sed < libtool > libtool-2 \
-	-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
-	-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
-	mv libtool-2 libtool
-	chmod 755 libtool
-	touch configure-stamp
 
+	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --disable-rpath --disable-debug
+
 build: build-stamp
-build-stamp: configure-stamp 
+
+build-stamp:  config.status
 	dh_testdir
-	CXXFLAGS="$(CXXFLAGS)" ${MAKE} 
-	touch build-stamp
 
-clean: clean-patched unpatch
+	$(MAKE)
 
-clean-patched:
+	touch build-stamp
+
+clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp 
 
-	-$(MAKE) clean
 	-$(MAKE) distclean
-	find -type d -name autom4te.cache -print0 | xargs -0 -r rm -rf \;
-	-rm -f platform.h auto-include.h
-	find -type d -name build -print0 | xargs -0 -r rm -rf \;
-	find \( -name config.sub -o -name config.guess \) -print0 | xargs -0 -r rm -f \;
 
-	# Fix permissions
-	if [ -r debian/executable.files ] ; then \
-		find -type d -print0 | xargs -0 -r chmod 755 ;\
-		find -type f ! -name 'rules' -print0 | xargs -0 -r chmod 644 ;\
-		xargs -t -r chmod +x < debian/executable.files ;\
-	fi
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
 
-	# Final static cleanups
-	if [ -r debian/deletable.files ] ; then \
-		xargs -t -r rm -f < debian/deletable.files ;\
-	fi
-
 	dh_clean
 
-
 install: build
 	dh_testdir
 	dh_testroot
-#	dh_clean -k
-	$(MAKE) install DESTDIR=`pwd`/debian/klibido
-	# Doc
-	rm `pwd`/debian/klibido/usr/share/doc/HTML/en/klibido/common
-	dh_link usr/share/doc/kde/HTML/en/common \
-	         usr/share/doc/kde/HTML/en/klibido/common
-	chown -R root:root `pwd`/debian/klibido/usr/share/doc/
-#	dh_installdirs usr/share/pixmaps/	       
-#	cp `pwd`/debian/klibido/usr/share/apps/klibido/icons/hicolor/16x16/apps/klibido.png \
-#                `pwd`/debian/klibido/usr/share/pixmaps/klibido-16.png
-#	cp `pwd`/debian/klibido/usr/share/apps/klibido/icons/hicolor/32x32/apps/klibido.png \
-#                `pwd`/debian/klibido/usr/share/pixmaps/klibido.png
-	dh_installmenu
-	dh_installman
+	dh_clean -k
+	dh_installdirs
 
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/klibido
+
+	# desktop file not needed in applnk until upstream fix
+	rm -rf $(CURDIR)/debian/klibido/usr/share/applnk
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -116,23 +69,20 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdirs
+	dh_installchangelogs ChangeLog
 	dh_installdocs
-	dh_installchangelogs
 	dh_install src/klibido.desktop usr/share/applications/kde
-	# Fix for 0.2.4.1's wrong permission
-	chmod 644 `pwd`/debian/klibido/usr/share/applications/kde/klibido.desktop
-	dh_link
+	dh_installmenu
+	dh_installman
+	dh_link usr/share/doc/kde/HTML/en/common usr/share/doc/kde/HTML/en/klibido/common
 	dh_strip
-	dh_compress
+	dh_compress -X.bz2 -X.css -X.dcl -X.docbook -X-license -X.tag
+	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	chmod -s * -R # fix for dh_builddeb
 	dh_builddeb
 
-
 binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch clean checkroot
+.PHONY: build clean binary-indep binary-arch binary install

Modified: kde-extras/klibido/trunk/debian/watch
===================================================================
--- kde-extras/klibido/trunk/debian/watch	2006-03-28 07:54:51 UTC (rev 3367)
+++ kde-extras/klibido/trunk/debian/watch	2006-03-28 08:54:30 UTC (rev 3368)
@@ -1,9 +1,5 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
-
+# http://sf.net/klibido/klibido-(.*)\.tar\.gz
 # Find new files on sourceforge, for debscripts >= 2.9
 # TODO remove 0.11 and 0.12
 opts="uversionmangle=s/0\.11|0\.12//" http://qa.debian.org/watch/sf.php?project=klibido klibido-([\d\.]*)\.tar\.gz




More information about the pkg-kde-commits mailing list