Author: ewl-guest
Date: 2009-11-07 12:11:38 +0000 (Sat, 07 Nov 2009)
New Revision: 11031
Modified:
trunk/freemind/debian/changelog
trunk/freemind/debian/export-freemind-cvs.sh
trunk/freemind/debian/freemind.sharedmimeinfo
trunk/freemind/debian/rules
trunk/freemind/debian/watch
Log:
New upstream version 0.9.0~rc6
Removed version 0.9.0~rc5+svn... from changelog as it has never been released.
Modified export-freemind-cvs.sh to also download via uscan.
Modified: trunk/freemind/debian/changelog
===================================================================
--- trunk/freemind/debian/changelog 2009-11-07 00:30:44 UTC (rev 11030)
+++ trunk/freemind/debian/changelog 2009-11-07 12:11:38 UTC (rev 11031)
@@ -1,14 +1,13 @@
-freemind (0.9.0~rc5+cvs20090906-1) unstable; urgency=low
+freemind (0.9.0~rc6+dfsg-1) unstable; urgency=low
- * New upstream version. RC5 had a critical bug, supposedly solved in this
- version taken from RCS, labeled internally with version RC6.
+ * New upstream version.
* Suppress build dependency on xsd2jibx, thanks to Upstream change.
* Bumped policy version to 3.8.3.0 without changes. I left 'editors' as
section because I understand that 'java' would be for programming
related packages, whereas FreeMind is for end-users.
* Remove call to obsoleted dh_desktop from debian/rules.
- -- Eric Lavarde <d...@zorglub.s.bawue.de> Sun, 06 Sep 2009 19:01:21 +0200
+ -- Eric Lavarde <d...@zorglub.s.bawue.de> Sat, 07 Nov 2009 11:02:07 +0100
freemind (0.9.0~rc4-1) unstable; urgency=low
Modified: trunk/freemind/debian/export-freemind-cvs.sh
===================================================================
--- trunk/freemind/debian/export-freemind-cvs.sh 2009-11-07 00:30:44 UTC
(rev 11030)
+++ trunk/freemind/debian/export-freemind-cvs.sh 2009-11-07 12:11:38 UTC
(rev 11031)
@@ -1,29 +1,61 @@
#!/bin/bash -x
# This small script can be used to export the FreeMind source tree from CVS
+# or get the sources from uscan and clean them up.
if [ $# -lt 1 ]
then
echo "Usage: $0 <FreeMind version> [<RCS tag> [keep]]" >&2
- echo "Example: $0 0.7.9.rc4 fm_0_8_0_rc4" >&2
+ echo "Usage: $0 uscan [keep]" >&2
+ echo "Example: $0 0.9.0~rc4 fm_0_9_0_rc4" >&2
+ echo "Example: $0 0.9.0~rc6 uscan" >&2
echo "Example: $0 0.8.0+01 FM-0-8-0 keep" >&2
+ echo "Use the 'uscan' parameter to use uscan to download sources." >&2
echo "Use the 'keep' parameter to keep a complete copy." >&2
exit 1
fi
-freemind_dir="freemind-$1"
-freemind_tar="freemind_$1"
-if [ $# -ge 2 ]
+# if we are in a svn-buildpackage structure, we use it
+CURDIR="$(pwd)"
+DESTDIR="${CURDIR}"
+if [ -d "../tarballs" ]
then
- mkdir "${freemind_dir}" || exit 1 # we don't want to overwrite
anything...
- cd "${freemind_dir}" || exit 1
- cvs -z3
-d:pserver:anonym...@freemind.cvs.sourceforge.net:/cvsroot/freemind export -r
"$2" freemind || exit 1
- cd ..
+ DESTDIR="${CURDIR}/../tarballs"
fi
+if [ $1 = "uscan" ]
+then
+ if [ -f ${CURDIR}/debian/changelog ]
+ then
+ ver=$(uscan --destdir "${DESTDIR}" --repack --rename
--force-download --dehs | awk -F'[<>]' '$2 == "upstream-version" {print $3}')
+ else
+ echo "ERROR: uscan can't be called without changelog." >&2
+ exit 1
+ fi
+else
+ ver=$1
+fi
+
+freemind_dir="freemind-$ver"
+freemind_orig_tar="freemind_${ver}.orig.tar.gz"
+freemind_dfsg_tar="freemind_${ver}+dfsg.orig.tar.gz"
+
+if [ $1 = "uscan" ] || [ $# -ge 2 ]
+then
+ mkdir "${DESTDIR}/${freemind_dir}" || exit 1 # we don't want to
overwrite anything...
+ cd "${DESTDIR}/${freemind_dir}" || exit 1
+ if [ $1 = "uscan" ]
+ then
+ tar xzf "../${freemind_orig_tar}" || exit 1
+ else
+ cvs -z3
-d:pserver:anonym...@freemind.cvs.sourceforge.net:/cvsroot/freemind export -r
"$2" freemind || exit 1
+ fi
+fi
+cd "${DESTDIR}"
+
### SAVE FIRST THE WHOLE FREEMIND TREE ###
if [ -n "$3" ]
then
mv ${freemind_dir} ${freemind_dir}.complete
- tar cvzf ${freemind_tar}.complete.tar.gz \
+ tar cvzf ${freemind_dfsg_tar}.complete.tar.gz \
${freemind_dir}.complete/freemind
mv ${freemind_dir}.complete ${freemind_dir}
fi
@@ -33,10 +65,11 @@
rm -vfr ${freemind_dir}/freemind/windows-launcher
### CREATE ORIG.TAR.GZ ###
-if [ -f "${freemind_tar}.orig.tar.gz" ]
+if [ -f "${freemind_dfsg_tar}" ]
then
- mv -f "${freemind_tar}.orig.tar.gz" "${freemind_tar}.orig.tar.gz.BAK" \
+ mv -f "${freemind_dfsg_tar}" "${freemind_dfsg_tar}.BAK" \
|| exit 1
fi
-tar cvzf "${freemind_tar}.orig.tar.gz" "${freemind_dir}" || exit 1
+tar czf "${freemind_dfsg_tar}" "${freemind_dir}" || exit 1
rm -fr "${freemind_dir}"
+cd "${CURDIR}"
Modified: trunk/freemind/debian/freemind.sharedmimeinfo
===================================================================
--- trunk/freemind/debian/freemind.sharedmimeinfo 2009-11-07 00:30:44 UTC
(rev 11030)
+++ trunk/freemind/debian/freemind.sharedmimeinfo 2009-11-07 12:11:38 UTC
(rev 11031)
@@ -22,6 +22,9 @@
<comment xml:lang="zh_CN">FreeMind 思维导图</comment>
<comment xml:lang="zh">FreeMind 心智圖</comment>
<glob pattern="*.mm"/>
+ <magic priority="65">
+ <match type="string" value="<map" offset="0"/>
+ </magic>
</mime-type>
</mime-info>
Modified: trunk/freemind/debian/rules
===================================================================
--- trunk/freemind/debian/rules 2009-11-07 00:30:44 UTC (rev 11030)
+++ trunk/freemind/debian/rules 2009-11-07 12:11:38 UTC (rev 11031)
@@ -30,5 +30,7 @@
buildxml-clean::
-$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET)
+# Get original sources directly from CVS or uscan
get-orig-source:
- debian/export-freemind-cvs.sh 0.9.0~rc4 fm_0_9_0_rc4
+ #debian/export-freemind-cvs.sh 0.9.0~rc6 fm_0_9_0_rc6
+ debian/export-freemind-cvs.sh uscan
Modified: trunk/freemind/debian/watch
===================================================================
--- trunk/freemind/debian/watch 2009-11-07 00:30:44 UTC (rev 11030)
+++ trunk/freemind/debian/watch 2009-11-07 12:11:38 UTC (rev 11031)
@@ -1,3 +1,3 @@
version=3
-opts=uversionmangle=s/(?i)_RC_?(\d+)$/~rc$1/;s/_Beta_?(\d+)$/~beta$1/;s/_/./g,
\
+opts=dversionmangle=s/\+dfsg.*//,uversionmangle=s/(?i)_RC_?(\d+)$/~rc$1/;s/_Beta_?(\d+)$/~beta$1/;s/_/./g,
\
http://sf.net/freemind/freemind-src-([\d_.]+(?:_(?:(?i)rc|beta)_?\d+)?)\.(?:zip|tar\.gz)
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
