rev 14536 - in kde-extras/kio-ftps/trunk/debian: . patches
Laurent Léonard
trash-guest at alioth.debian.org
Thu Apr 30 13:50:41 UTC 2009
Author: trash-guest
Date: 2009-04-30 13:50:40 +0000 (Thu, 30 Apr 2009)
New Revision: 14536
Added:
kde-extras/kio-ftps/trunk/debian/patches/
kde-extras/kio-ftps/trunk/debian/patches/cmakelists_kde42_fix.diff
kde-extras/kio-ftps/trunk/debian/patches/series
Modified:
kde-extras/kio-ftps/trunk/debian/README.source
kde-extras/kio-ftps/trunk/debian/changelog
kde-extras/kio-ftps/trunk/debian/control
kde-extras/kio-ftps/trunk/debian/copyright
kde-extras/kio-ftps/trunk/debian/rules
kde-extras/kio-ftps/trunk/debian/watch
Log:
* Switch to Quilt for patch management.
* Remove all *~ files.
* debian/control:
+ Add cdbs, quilt and pkg-kde-tools (>= 0.4.2) as build dependencies.
+ Make kdelibs5-dev build dependency versioned to (>= 4:4.2.2).
+ Add ${misc:Depends} as dependency.
+ Fix lowercase letters starting sentences in the long description.
+ Bump Standards-Version to 3.8.1.
* debian/copyright:
+ Update to use DEP5 format specification.
+ Add information about the removed files.
+ Update copyright year for debian/* files.
* debian/rules:
+ Update to use CDBS (kde.mk from pkg-kde-tools).
+ Add Quilt support.
* debian/patches/cmakelists_kde42_fix.diff
+ Introduce to build for KDE 4.2. (Closes: #515507)
* debian/README.source:
+ Add Quilt usage.
+ Remove DFSG-changes.
* debian/watch:
+ Update for DFSG mangle.
Modified: kde-extras/kio-ftps/trunk/debian/README.source
===================================================================
--- kde-extras/kio-ftps/trunk/debian/README.source 2009-04-30 12:22:44 UTC (rev 14535)
+++ kde-extras/kio-ftps/trunk/debian/README.source 2009-04-30 13:50:40 UTC (rev 14536)
@@ -1,9 +1,5 @@
-DFSG-changes
-------------
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
-The only change made to the original tarball to become dfsg-compliant was
-removing the file
-
-rfc4217.txt
-
-because it has a non-free license.
+See /usr/share/doc/quilt/README.source for a detailed explanation.
Modified: kde-extras/kio-ftps/trunk/debian/changelog
===================================================================
--- kde-extras/kio-ftps/trunk/debian/changelog 2009-04-30 12:22:44 UTC (rev 14535)
+++ kde-extras/kio-ftps/trunk/debian/changelog 2009-04-30 13:50:40 UTC (rev 14536)
@@ -1,3 +1,30 @@
+kio-ftps (0.2+dfsg-1) unstable; urgency=low
+
+ * Switch to Quilt for patch management.
+ * Remove all *~ files.
+ * debian/control:
+ + Add cdbs, quilt and pkg-kde-tools (>= 0.4.2) as build dependencies.
+ + Make kdelibs5-dev build dependency versioned to (>= 4:4.2.2).
+ + Add ${misc:Depends} as dependency.
+ + Fix lowercase letters starting sentences in the long description.
+ + Bump Standards-Version to 3.8.1.
+ * debian/copyright:
+ + Update to use DEP5 format specification.
+ + Add information about the removed files.
+ + Update copyright year for debian/* files.
+ * debian/rules:
+ + Update to use CDBS (kde.mk from pkg-kde-tools).
+ + Add Quilt support.
+ * debian/patches/cmakelists_kde42_fix.diff
+ + Introduce to build for KDE 4.2. (Closes: #515507)
+ * debian/README.source:
+ + Add Quilt usage.
+ + Remove DFSG-changes.
+ * debian/watch:
+ + Update for DFSG mangle.
+
+ -- Laurent Léonard <laurent at open-minds.org> Sun, 05 Apr 2009 19:39:52 +0200
+
kio-ftps (0.2-1) unstable; urgency=low
* Initial release (Closes: #501342)
Modified: kde-extras/kio-ftps/trunk/debian/control
===================================================================
--- kde-extras/kio-ftps/trunk/debian/control 2009-04-30 12:22:44 UTC (rev 14535)
+++ kde-extras/kio-ftps/trunk/debian/control 2009-04-30 13:50:40 UTC (rev 14536)
@@ -2,13 +2,13 @@
Section: kde
Priority: extra
Maintainer: Laurent Léonard <laurent at open-minds.org>
-Build-Depends: cmake, debhelper (>= 7), kdelibs5-dev
-Standards-Version: 3.8.0
-Homepage: http://kasablanca.berlios.de/kio-ftps/
+Build-Depends: cdbs, cmake, debhelper (>= 7), kdelibs5-dev (>= 4:4.2.2), pkg-kde-tools (>= 0.4.2), quilt
+Standards-Version: 3.8.1
+Homepage: http://kasablanca.berlios.de/kio-ftps
Package: kio-ftps
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: an ftps KIO slave for KDE 4
An ftps KIO slave for KDE 4, based on rfc4217 and build upon the ftp KIO-slave
sources. it should work yet with most server implementations. it issues an
Modified: kde-extras/kio-ftps/trunk/debian/copyright
===================================================================
--- kde-extras/kio-ftps/trunk/debian/copyright 2009-04-30 12:22:44 UTC (rev 14535)
+++ kde-extras/kio-ftps/trunk/debian/copyright 2009-04-30 13:50:40 UTC (rev 14536)
@@ -1,15 +1,19 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=252
-Upstream-Name: kio-ftps
-Upstream-Maintainer: Magnus Kulke <sikor_sxe at radicalapproach.de>
-Upstream-Source: http://kasablanca.berlios.de/kio-ftps/
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=48
+Name: kio-ftps
+Maintainer: Magnus Kulke <sikor_sxe at radicalapproach.de>
+Source: http://kasablanca.berlios.de/kio-ftps
+The original upstream source was repackaged to remove the rfc4217.txt
+documentation file, which was not distributed under a DFSG-free licence.
+All *~ files were also removed.
+
Files: *
-Copyright: Copyright 2008, Magnus Kulke <sikor_sxe at radicalapproach.de>
-Copyright: Copyright 2000-2006, David Faure <faure at kde.org>
+Copyright: 2008, Magnus Kulke <sikor_sxe at radicalapproach.de>
+ 2000-2006, David Faure <faure at kde.org>
License: GPL-2+
Files: debian/*
-Copyright: Copyright 2008, Laurent Léonard <laurent at open-minds.org>
+Copyright: 2008-2009, Laurent Léonard <laurent at open-minds.org>
License: GPL-2+
Licence: GPL-2+
@@ -26,6 +30,6 @@
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 full text of the GNU General Public License can be found
-in the `/usr/share/common-licenses/GPL' file.
+
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL' file.
Added: kde-extras/kio-ftps/trunk/debian/patches/cmakelists_kde42_fix.diff
===================================================================
--- kde-extras/kio-ftps/trunk/debian/patches/cmakelists_kde42_fix.diff (rev 0)
+++ kde-extras/kio-ftps/trunk/debian/patches/cmakelists_kde42_fix.diff 2009-04-30 13:50:40 UTC (rev 14536)
@@ -0,0 +1,15 @@
+# Update CMakeLists.txt to build for KDE 4.2.
+
+Index: kio-ftps-0.2/CMakeLists.txt
+===================================================================
+--- kio-ftps-0.2.orig/CMakeLists.txt 2009-04-19 03:01:49.000000000 +0200
++++ kio-ftps-0.2/CMakeLists.txt 2009-04-20 01:53:06.000000000 +0200
+@@ -8,7 +8,7 @@
+
+ kde4_add_plugin( kio_ftps ${mySources} )
+
+-target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} kio )
++target_link_libraries(kio_ftps ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} )
+
+ install(TARGETS kio_ftps DESTINATION ${PLUGIN_INSTALL_DIR} )
+ install( FILES ftps.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
Added: kde-extras/kio-ftps/trunk/debian/patches/series
===================================================================
--- kde-extras/kio-ftps/trunk/debian/patches/series (rev 0)
+++ kde-extras/kio-ftps/trunk/debian/patches/series 2009-04-30 13:50:40 UTC (rev 14536)
@@ -0,0 +1 @@
+cmakelists_kde42_fix.diff
Modified: kde-extras/kio-ftps/trunk/debian/rules
===================================================================
--- kde-extras/kio-ftps/trunk/debian/rules 2009-04-30 12:22:44 UTC (rev 14535)
+++ kde-extras/kio-ftps/trunk/debian/rules 2009-04-30 13:50:40 UTC (rev 14536)
@@ -1,46 +1,5 @@
#!/usr/bin/make -f
-builddir/Makefile:
- dh_testdir
- mkdir -p builddir
- cd builddir && cmake .. -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_LD_FLAGS=-Wl,-z,defs -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON
-
-build: build-stamp
-build-stamp: builddir/Makefile
- dh_testdir
- $(MAKE) -C builddir
- touch $@
-
-clean:
- 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/kio-ftps install
-
-binary-indep: install
-
-binary-arch: install
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: binary binary-arch binary-indep build clean install
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
Modified: kde-extras/kio-ftps/trunk/debian/watch
===================================================================
--- kde-extras/kio-ftps/trunk/debian/watch 2009-04-30 12:22:44 UTC (rev 14535)
+++ kde-extras/kio-ftps/trunk/debian/watch 2009-04-30 13:50:40 UTC (rev 14536)
@@ -1,3 +1,4 @@
version=3
-http://download.berlios.de/kasablanca/kio-ftps-(.*)\.tar\.gz
+opts=dversionmangle=s/\+dfsg// \
+ http://download.berlios.de/kasablanca/kio-ftps-(.*)\.tar\.gz
More information about the pkg-kde-commits
mailing list