rev 14378 - kde-extras/krename/trunk/debian

Fathi Boudra fabo at alioth.debian.org
Sun Apr 12 20:39:18 UTC 2009


Author: fabo
Date: 2009-04-12 20:39:18 +0000 (Sun, 12 Apr 2009)
New Revision: 14378

Removed:
   kde-extras/krename/trunk/debian/krename.1
   kde-extras/krename/trunk/debian/krename.manpages
   kde-extras/krename/trunk/debian/patches/
Modified:
   kde-extras/krename/trunk/debian/changelog
   kde-extras/krename/trunk/debian/compat
   kde-extras/krename/trunk/debian/control
   kde-extras/krename/trunk/debian/copyright
   kde-extras/krename/trunk/debian/rules
   kde-extras/krename/trunk/debian/watch
Log:
Merge experimental branches.
Prepare krename for KDE4 upload.
 * New upstream release. (Closes: #347621, #515455)
 * Bump compat to 7.
 * Update debian/control:
   - Bump debhelper to 7.
   - Add taglib build dependency.
   - Drop cdbs build dependency.
   - Bump Standards-Version to 3.8.1. No changes needed.
 * Update debian/copyright informations.
   Add modeltest source code copyrights.
 * Remove krename manpage. Outdated. (Closes: #501928)
 * Rewrite debian/rules.
 * Update debian/watch.


Modified: kde-extras/krename/trunk/debian/changelog
===================================================================
--- kde-extras/krename/trunk/debian/changelog	2009-04-12 17:51:01 UTC (rev 14377)
+++ kde-extras/krename/trunk/debian/changelog	2009-04-12 20:39:18 UTC (rev 14378)
@@ -1,11 +1,29 @@
-krename (3.0.14-2) UNRELEASED; urgency=low
+krename (3.9.2-1) unstable; urgency=low
 
-  * NOT RELEASED YET
-  * Remove obsolete debian/patches/dbug345919.patch
-  * svn propset mergeWithUpstream 1 debian
+  * New upstream release. (Closes: #347621, #515455)
+  * Bump compat to 7.
+  * Update debian/control:
+    - Bump debhelper to 7.
+    - Add taglib build dependency.
+    - Drop cdbs build dependency.
+    - Bump Standards-Version to 3.8.1. No changes needed.
+  * Update debian/copyright informations.
+    Add modeltest source code copyrights.
+  * Remove krename manpage. Outdated. (Closes: #501928)
+  * Rewrite debian/rules.
+  * Update debian/watch.
 
- -- Mark Purcell <msp at debian.org>  Sun, 12 Aug 2007 12:31:34 +0100
+ -- Fathi Boudra <fabo at debian.org>  Sun, 12 Apr 2009 21:35:43 +0200
 
+krename (3.9.0-1) unstable; urgency=low
+
+  * Initial KDE 4 release.
+  * Bump compat and debhelper to 6.
+  * Adjust build dependencies to new build system.
+  * Add Homepage, Vcs-Browser and Vcs-Svn fields.
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 04 May 2008 12:12:22 +0200
+
 krename (3.0.14-1) unstable; urgency=low
 
   * New Upstream Release (Closes: #402859, #423440)
@@ -115,4 +133,3 @@
   * Initial Release.
 
  -- Roman Kreisel <roman.kreisel at web.de>  Sun, 14 Nov 2004 23:23:38 +0100
-

Modified: kde-extras/krename/trunk/debian/compat
===================================================================
--- kde-extras/krename/trunk/debian/compat	2009-04-12 17:51:01 UTC (rev 14377)
+++ kde-extras/krename/trunk/debian/compat	2009-04-12 20:39:18 UTC (rev 14378)
@@ -1 +1 @@
-5
+7

Modified: kde-extras/krename/trunk/debian/control
===================================================================
--- kde-extras/krename/trunk/debian/control	2009-04-12 17:51:01 UTC (rev 14377)
+++ kde-extras/krename/trunk/debian/control	2009-04-12 20:39:18 UTC (rev 14378)
@@ -1,18 +1,18 @@
 Source: krename
-Section: kde
+Section: utils
 Priority: optional
-Maintainer:  Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Richard A. Johnson <nixternal at ubuntu.com> 
-Build-Depends: debhelper (>= 5), cdbs, kdelibs4-dev, patchutils, libx11-dev, libxext-dev, libxpm-dev, x-dev, libtool, automake1.10
-Standards-Version: 3.7.2
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo at debian.org>, Richard A. Johnson <nixternal at ubuntu.com>
+Build-Depends: debhelper (>= 7), cmake, quilt, kdelibs5-dev, libtag1-dev
+Standards-Version: 3.8.1
+Homepage: http://www.krename.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/krename/trunk
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/krename/trunk
 
 Package: krename
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Powerful batch renamer for KDE 3.x
- This package contains a very powerful batch file renamer for KDE3 
- which can rename a list of files based on a set of expressions.
- It can copy/move the files to another directory or simply rename 
- the input files.
- .
- Homepage: http://www.krename.net
+Description: powerful batch renamer for KDE
+ KRename is a very powerful batch file renamer for KDE which can rename a list
+ of files based on a set of expressions. It can copy/move the files to another
+ directory or simply rename the input files.

Modified: kde-extras/krename/trunk/debian/copyright
===================================================================
--- kde-extras/krename/trunk/debian/copyright	2009-04-12 17:51:01 UTC (rev 14377)
+++ kde-extras/krename/trunk/debian/copyright	2009-04-12 20:39:18 UTC (rev 14378)
@@ -1,34 +1,48 @@
-This package was debianized by Roman Kreisel <roman.kreisel at web.de> on
-Sun, 14 Nov 2004 23:23:38 +0100.
+This package was debianized by:
 
-Maintenance was taken over by the Debian KDE Extras Team on Thu, 17 May 2007
-15:01:00 -0600
+    Roman Kreisel <roman.kreisel at web.de> on Sun, 14 Nov 2004 23:23:38 +0100
+    Maintenance was taken over by the Debian KDE Extras Team
+    on Thu, 17 May 2007 +0200
 
-It was downloaded from http://www.krename.net/
+It was downloaded from:
 
-Copyright: 2001-2007 Dominik Seichter <domseichter at web.de>
+    http://www.krename.net
 
-Upstream Author: Dominik Seichter
+Upstream Author:
 
+    Dominik Seichter <domseichter at web.de>
+
+Copyright:
+
+    Copyright (C) 2001-2009 Dominik Seichter
+
+Copyright for modeltest source code:
+
+    Copyright (C) 2007 Trolltech ASA. All Rights Reserved.
+
 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; version 2 dated June, 1991.
+    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.
+    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.
+    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'.
+Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-The Debian packaging is
-(C) 2007 Richard A. Johnson <nixternal at ubuntu.com>
-and is licensed under the GPL, see above.
+The Debian packaging is:
+
+    Copyright (C) 2008-2009 Fathi Boudra <fabo at debian.org>
+    Copyright (C) 2007 Richard A. Johnson <nixternal at ubuntu.com>
+
+and is licensed under the GPL version 3, 
+see `/usr/share/common-licenses/GPL-3'.

Modified: kde-extras/krename/trunk/debian/rules
===================================================================
--- kde-extras/krename/trunk/debian/rules	2009-04-12 17:51:01 UTC (rev 14377)
+++ kde-extras/krename/trunk/debian/rules	2009-04-12 20:39:18 UTC (rev 14378)
@@ -1,20 +1,74 @@
 #!/usr/bin/make -f
 
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/kde.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
+include /usr/share/quilt/quilt.make
 
-### Libtool and Automake updates
-post-patches:: debian/stamp-autothings-update
-debian/stamp-autothings-update:
-	cp -f /usr/share/libtool/libtool.m4 $(DEB_SRCDIR)/admin/libtool.m4.in
-	cp -f /usr/share/libtool/ltmain.sh  $(DEB_SRCDIR)/admin/ltmain.sh
-	for f in /usr/share/automake-1.10/*; do \
-	if  test -f $$f && \
-	test -f $(DEB_SRCDIR)/admin/`basename $$f`; then \
-	cp -f $$f $(DEB_SRCDIR)/admin; \
-	fi; \
-	done
+builddir/Makefile: $(QUILT_STAMPFN)
+	dh_testdir
+
+	mkdir -p builddir
+	cd builddir && cmake .. \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_C_FLAGS="$(CFLAGS)" \
+		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+		-DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_VERBOSE_MAKEFILE=ON \
+		$(DEB_CMAKE_KDE4_FLAGS)
+
+build: build-stamp
+build-stamp: builddir/Makefile
+	dh_testdir
+
+	$(MAKE) -C builddir
+
 	touch $@
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+
+	rm -rf builddir
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	$(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/krename 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_installman
+	dh_desktop
+	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

Modified: kde-extras/krename/trunk/debian/watch
===================================================================
--- kde-extras/krename/trunk/debian/watch	2009-04-12 17:51:01 UTC (rev 14377)
+++ kde-extras/krename/trunk/debian/watch	2009-04-12 20:39:18 UTC (rev 14378)
@@ -1,6 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# Site		Directory		Pattern			Version	Script
-version=2
-http://heanet.dl.sourceforge.net/sourceforge/krename/krename-(.*)\.tar\.bz2	debian  uupdate
+version=3
+http://sf.net/krename/krename-(.*)\.tar\.bz2




More information about the pkg-kde-commits mailing list