[pkg-java] r6142 - trunk/entagged/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-04-11 22:20:14 +0000 (Fri, 11 Apr 2008)
New Revision: 6142

Removed:
   trunk/entagged/debian/orig-tar.sh
   trunk/entagged/debian/watch
Modified:
   trunk/entagged/debian/
   trunk/entagged/debian/changelog
   trunk/entagged/debian/rules
Log:
* new upstream release
* Remove watch file because upstream does not ship versioned files any more.


Property changes on: trunk/entagged/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/entagged/debian/changelog
===================================================================
--- trunk/entagged/debian/changelog	2008-04-11 21:56:13 UTC (rev 6141)
+++ trunk/entagged/debian/changelog	2008-04-11 22:20:14 UTC (rev 6142)
@@ -1,3 +1,10 @@
+entagged (0.35-1) unstable; urgency=low
+
+  * new upstream release
+  * Remove watch file because upstream does not ship versioned files any more.
+
+ -- Torsten Werner <twerner at debian.org>  Sat, 12 Apr 2008 00:18:52 +0200
+
 entagged (0.31.ds2-1) unstable; urgency=low
   
   * Repackage the source - some problems with the previous tarball.     

Deleted: trunk/entagged/debian/orig-tar.sh
===================================================================
--- trunk/entagged/debian/orig-tar.sh	2008-04-11 21:56:13 UTC (rev 6141)
+++ trunk/entagged/debian/orig-tar.sh	2008-04-11 22:20:14 UTC (rev 6142)
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=entagged-$2.orig
-
-# clean up the upstream tarball
-mkdir temp
-tar -x -z -f $3 -C temp
-mv temp/entagged $DIR
-GZIP=--best tar -c -z -f $3 --exclude '*.jar' --exclude '*CVS*' $DIR
-rm -rf $DIR temp
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $3 $origDir
-  echo "moved $3 to $origDir"
-fi
-
-exit 0

Modified: trunk/entagged/debian/rules
===================================================================
--- trunk/entagged/debian/rules	2008-04-11 21:56:13 UTC (rev 6141)
+++ trunk/entagged/debian/rules	2008-04-11 22:20:14 UTC (rev 6142)
@@ -24,4 +24,8 @@
 	  $(IMAGE_DESTDIR)/128x128/apps/entagged.png
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	wget http://switch.dl.sourceforge.net/sourceforge/entagged/entagged.tar.gz
+	mkdir _x
+	tar -x -C _x -z -f entagged.tar.gz
+	tar -c -C _x -z -f entagged_$(DEB_UPSTREAM_VERSION).orig.tar.gz --exclude '*.jar' entagged
+	$(RM) -r entagged.tar.gz _x

Deleted: trunk/entagged/debian/watch
===================================================================
--- trunk/entagged/debian/watch	2008-04-11 21:56:13 UTC (rev 6141)
+++ trunk/entagged/debian/watch	2008-04-11 22:20:14 UTC (rev 6142)
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/entagged/ entagged-tageditor-(\d.*)\.tar\.gz debian debian/orig-tar.sh