[med-svn] r10924 - trunk/packages/king/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-05-21 12:46:50 +0000 (Mon, 21 May 2012)
New Revision: 10924

Modified:
   trunk/packages/king/trunk/debian/changelog
   trunk/packages/king/trunk/debian/get-orig-source
Log:
New upstream version (also including molikin)


Modified: trunk/packages/king/trunk/debian/changelog
===================================================================
--- trunk/packages/king/trunk/debian/changelog	2012-05-21 12:44:39 UTC (rev 10923)
+++ trunk/packages/king/trunk/debian/changelog	2012-05-21 12:46:50 UTC (rev 10924)
@@ -1,3 +1,11 @@
+king (2.21.120420-1) UNRELEASED; urgency=low
+
+  * New upstream version
+  * debian/get-orig-source: This version includes molikin so the separate
+    fetching of this source is not needed any more.
+
+ -- Andreas Tille <tille at debian.org>  Mon, 21 May 2012 14:45:14 +0200
+
 king (2.20.110601-1) unstable; urgency=low
 
   * Initial release (Closes: #669644)

Modified: trunk/packages/king/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/king/trunk/debian/get-orig-source	2012-05-21 12:44:39 UTC (rev 10923)
+++ trunk/packages/king/trunk/debian/get-orig-source	2012-05-21 12:46:50 UTC (rev 10924)
@@ -57,17 +57,6 @@
   ln -s $dir `echo $dir | sed 's/-[^-]\+-src$//'`
 done
 
-if [ ! -d molikin ] ; then
-  if [ ! -f ../molikin.zip ] ; then
-    # The missing component molikin was sended by the authors to
-    # Andreas Tille <tille at debian.org> and it is temporarily provided
-    # as zip archive here until upstream will have fixed the official
-    # download area
-    wget -q --output-document ../molikin.zip http://people.debian.org/~tille/packages/king/molikin.zip
-  fi
-  unzip -q ../molikin.zip
-fi
-
 cd ..
 GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$VERSION".orig.tar.gz "${TARDIR}"
 rm -rf "$TARDIR"