rev 6231 - trunk/packages/kdepim/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-05-16 10:30:29 +0000 (Wed, 16 May 2007)
New Revision: 6231

Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/rules
Log:
kdepim 3.5.7



Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2007-05-16 09:44:33 UTC (rev 6230)
+++ trunk/packages/kdepim/debian/changelog	2007-05-16 10:30:29 UTC (rev 6231)
@@ -1,5 +1,7 @@
 kdepim (4:3.5.7-1) unstable; urgency=low
 
+  +++ Changes by Sune Vuorela:
+  
   * New upstream release:
     - Remove all the branch pull patches (01*).
     - Remove the clamav patch (merged upstream).
@@ -9,7 +11,12 @@
     - Remove kpilot header patches - applied upstream.
     - Ksync package goes away, bye bye.
     - kitchensync has changed big time. Conflict against older kdebluetooth.
+  
+  +++ Changes by Ana Beatriz Guerrero Lopez:
 
+  * Non-free IETF docs are now replaced by urls to the docs. Remove
+    get-orig-source rule from debian/runes, not longer necessary.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 16 Apr 2007 21:37:29 +0200
 
 kdepim (4:3.5.6.dfsg.1-2) unstable; urgency=low

Modified: trunk/packages/kdepim/debian/rules
===================================================================
--- trunk/packages/kdepim/debian/rules	2007-05-16 09:44:33 UTC (rev 6230)
+++ trunk/packages/kdepim/debian/rules	2007-05-16 10:30:29 UTC (rev 6231)
@@ -99,32 +99,3 @@
 KDE_SOURCEDIR := dfsg-tmp/$(DEB_SOURCE_PACKAGE)-$(KDE_UPSTREAM_VERSION)
 NEWDEB_SOURCEDIR := $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
 
-# Expects kdepim-#.#.#.tar.bz2 to reside in .., and produces
-# ../kdepim_#.#.#.dfsg.#.orig.tar.gz file.
-make-orig-source:
-	test -f $(KDE_TARBALL)
-	mkdir -p dfsg-tmp
-	tar -C dfsg-tmp -xjf $(KDE_TARBALL)
-	rm $(KDE_SOURCEDIR)/kioslaves/sieve/rfc3431.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/rfc3028.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-daboo-sieve-include.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-daboo-sieve-spamtest.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-degener-sieve-body-00.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-degener-sieve-copy.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-degener-sieve-editheader.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-degener-sieve-multiscript.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-homme-sieve-variables.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-martin-managesieve-04.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-martin-sieve-notify-01.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-melnikov-sieve-imapflags.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-murchison-sieve-regex-06.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-murchison-sieve-subaddress-05.txt \
-		$(KDE_SOURCEDIR)/kioslaves/sieve/draft-showalter-sieve-vacation-04.txt \
-		$(KDE_SOURCEDIR)/kaddressbook/xxport/samples/rfc2849.txt || \
-		(echo "Update the list of IETF docs in debian/rules"; false)
-	if grep -r "Copyright (C) The Internet Society" $(KDE_SOURCEDIR); then \
-		echo "Found new IETF docs, update debian/rules"; false; \
-	fi
-	mv $(KDE_SOURCEDIR) dfsg-tmp/$(NEWDEB_SOURCEDIR)
-	(cd dfsg-tmp; tar -cf - $(NEWDEB_SOURCEDIR)/ | gzip -c9) > ../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	rm -rf dfsg-tmp