[pkg-java] r11805 - trunk/jajuk/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-03-03 22:51:04 +0000 (Wed, 03 Mar 2010)
New Revision: 11805

Removed:
   trunk/jajuk/debian/docs
   trunk/jajuk/debian/install
Modified:
   trunk/jajuk/debian/README.source
   trunk/jajuk/debian/changelog
   trunk/jajuk/debian/orig-tar.sh
   trunk/jajuk/debian/rules
Log:
* In accordance with upstream recommendation, revert to 1.8.4 tag
  as 1.8.5 release won't be released:
  - use epoch "1" as release number prefix
  - debian/orig-tar.sh: svn export from tags
* debian/install: Removed (logic moved to debian/rules)
* debian/README.source: Remove "patch system" section as we now use
  3.0 (quilt) as source format
* debian/docs: Removed (empty)

Modified: trunk/jajuk/debian/README.source
===================================================================
--- trunk/jajuk/debian/README.source	2010-03-03 22:40:12 UTC (rev 11804)
+++ trunk/jajuk/debian/README.source	2010-03-03 22:51:04 UTC (rev 11805)
@@ -1,12 +1,3 @@
-Patch System
-============
-
-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.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
-
 Creating source package
 =======================
 

Modified: trunk/jajuk/debian/changelog
===================================================================
--- trunk/jajuk/debian/changelog	2010-03-03 22:40:12 UTC (rev 11804)
+++ trunk/jajuk/debian/changelog	2010-03-03 22:51:04 UTC (rev 11805)
@@ -1,3 +1,16 @@
+jajuk (1:1.8.4-1) unstable; urgency=low
+
+  * In accordance with upstream recommendation, revert to 1.8.4 tag
+    as 1.8.5 release won't be released:
+    - use epoch "1" as release number prefix
+    - debian/orig-tar.sh: svn export from tags
+  * debian/install: Removed (logic moved to debian/rules)
+  * debian/README.source: Remove "patch system" section as we now use
+    3.0 (quilt) as source format
+  * debian/docs: Removed (empty)
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Wed, 03 Mar 2010 23:26:53 +0100
+
 jajuk (1.8.5~svn5725-1) unstable; urgency=low
 
   * New snapshot from 1.8 maintenance branch (r5725):

Deleted: trunk/jajuk/debian/docs
===================================================================
--- trunk/jajuk/debian/docs	2010-03-03 22:40:12 UTC (rev 11804)
+++ trunk/jajuk/debian/docs	2010-03-03 22:51:04 UTC (rev 11805)
@@ -1 +0,0 @@
-

Deleted: trunk/jajuk/debian/install
===================================================================
--- trunk/jajuk/debian/install	2010-03-03 22:40:12 UTC (rev 11804)
+++ trunk/jajuk/debian/install	2010-03-03 22:51:04 UTC (rev 11805)
@@ -1 +0,0 @@
-debian/jajuk.desktop /usr/share/applications

Modified: trunk/jajuk/debian/orig-tar.sh
===================================================================
--- trunk/jajuk/debian/orig-tar.sh	2010-03-03 22:40:12 UTC (rev 11804)
+++ trunk/jajuk/debian/orig-tar.sh	2010-03-03 22:51:04 UTC (rev 11805)
@@ -4,14 +4,14 @@
 TAR=../jajuk_$1.orig.tar.gz
 DIR=jajuk-$1.orig
 VERSION=`echo $1 | sed -e 's/[+~].*//g' | sed -e 's/\./_/g'`
-REVISION=`echo $1 | sed -e 's/.*svn//'`
+#REVISION=`echo $1 | sed -e 's/.*svn//'`
 TAG=release-$VERSION
 
 # clean up the upstream tarball
 mkdir $DIR
 mkdir $DIR/src
 (cd $DIR/src; \
-svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/branches/maintenance-1_8/src/main)
+svn export https://jajuk.svn.sourceforge.net/svnroot/jajuk/tags/$TAG/src/main)
 # trunk version
 # svn export -r $REVISION https://jajuk.svn.sourceforge.net/svnroot/jajuk/trunk/jajuk/src/main
 GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR

Modified: trunk/jajuk/debian/rules
===================================================================
--- trunk/jajuk/debian/rules	2010-03-03 22:40:12 UTC (rev 11804)
+++ trunk/jajuk/debian/rules	2010-03-03 22:51:04 UTC (rev 11805)
@@ -15,5 +15,7 @@
 	dh_link /usr/share/java/jajuk-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jajuk.jar
 	install -m 644 -D src/main/resources/icons/16x16/jajuk-icon_16x16.png \
 		$(DEB_DESTDIR)/usr/share/pixmaps/jajuk.png
+	dh_install debian/jajuk.desktop /usr/share/applications/
+
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)