[Pkg-ocaml-maint-commits] r1598 - in trunk/packages/unison/trunk: .
debian debian/utils
Sylvain LE GALL
gildor-guest at costa.debian.org
Sat Aug 13 23:16:28 UTC 2005
Author: gildor-guest
Date: 2005-08-13 23:16:16 +0000 (Sat, 13 Aug 2005)
New Revision: 1598
Added:
trunk/packages/unison/trunk/unison_2.13.16.orig.tar.gz
Removed:
trunk/packages/unison/trunk/unison_2.10.2.orig.tar.gz
Modified:
trunk/packages/unison/trunk/debian/changelog
trunk/packages/unison/trunk/debian/control
trunk/packages/unison/trunk/debian/rules
trunk/packages/unison/trunk/debian/unison-gtk.menu.in
trunk/packages/unison/trunk/debian/unison-gtk.postinst.in
trunk/packages/unison/trunk/debian/unison-gtk.prerm.in
trunk/packages/unison/trunk/debian/unison.1.in
trunk/packages/unison/trunk/debian/unison.doc-base.in
trunk/packages/unison/trunk/debian/unison.postinst.in
trunk/packages/unison/trunk/debian/unison.prerm.in
trunk/packages/unison/trunk/debian/utils/purify_unison
trunk/packages/unison/trunk/debian/watch
Log:
New upstream version -- SLG
Modified: trunk/packages/unison/trunk/debian/changelog
===================================================================
--- trunk/packages/unison/trunk/debian/changelog 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/changelog 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,3 +1,25 @@
+unison (2.13.16-1) unstable; urgency=low
+
+ * New upstream release (Closes: #322042)
+ * Use the same binary version scheme as the "-addversionno" unison
+ option (Closes: #308507)
+ * Change the menu section to Apps/Tools (Closes: #308683).
+ * The conflict between unison and unison-gtk as proposed in bug #308683 will
+ not be used:
+ * the dependency is mainly a documentation dependency (symlink for
+ unison-gtk.1.gz and /usr/share/doc/unison-gtk )
+ * user can choose to install both unison and unison-gtk
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org> Sat, 13 Aug 2005 20:17:11 +0200
+
+unison (2.12.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Change the watch file to allow QA to use it
+ * Upgrade standards version to 3.6.2.0 (no change)
+
+ -- Sylvain Le Gall <sylvain.le-gall at polytechnique.org> Thu, 28 Jul 2005 00:15:20 +0200
+
unison (2.10.2-3) unstable; urgency=low
* Backport of sarge changes. Unison doesn't read/write on
Modified: trunk/packages/unison/trunk/debian/control
===================================================================
--- trunk/packages/unison/trunk/debian/control 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/control 2005-08-13 23:16:16 UTC (rev 1598)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Sylvain Le Gall <sylvain.le-gall at polytechnique.org>
Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, liblablgtk2-ocaml-dev, dpatch, chrpath
-Standards-Version: 3.6.1.0
+Standards-Version: 3.6.2.0
Package: unison
Architecture: any
Modified: trunk/packages/unison/trunk/debian/rules
===================================================================
--- trunk/packages/unison/trunk/debian/rules 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/rules 2005-08-13 23:16:16 UTC (rev 1598)
@@ -4,14 +4,27 @@
include /usr/share/dpatch/dpatch.make
PACKAGE=unison
-VERSION=2.10.2
+
+# Variable that will be replaced in files
+
+VERSION=$(shell dpkg-parsechangelog | awk "/Version: .*/ { gsub(\"Version: \",\"\"); gsub(\"-.*\",\"\"); print; }")
# Package version should be set to the version you want to be appended to
# the package name
PACKAGE_VERSION=
+
# PRIORITY should be set to 10 for stable compatibility package
# and to 20 for unstable/testing package
PRIORITY=20
+UNISON=unison-$(VERSION)
+UNISON_MAJ=UNISON-$(VERSION)
+UNISON_PACKAGE=unison$(PACKAGE_VERSION)
+
+UNISON_GTK=unison-$(VERSION)-gtk
+UNISON_GTK_PACKAGE=$(UNISON_PACKAGE)-gtk
+
+# End of variable to be replaced
+
# set $(NATIVE) to true if this arch has an optimising compiler
NATIVE := $(shell test -x /usr/bin/ocamlopt -o -x /usr/bin/ocamlopt.opt && echo true || echo false)
@@ -35,25 +48,32 @@
# string
for i in $(RENAME); do \
DST=$$i; \
- DST=$${DST/unison/unison$(PACKAGE_VERSION)}; \
+ DST=$${DST/unison/$(UNISON_PACKAGE)}; \
DST=$${DST%%.in}; \
- sed -e "s/@VERSION@/$(VERSION)/g" $$i | \
- sed -e "s/@PRIORITY@/$(PRIORITY)/g" | \
- sed -e "s/@PACKAGE_VERSION@/$(PACKAGE_VERSION)/g" > \
+ sed -e "\
+ s/@VERSION@/$(VERSION)/g; \
+ s/@PACKAGE_VERSION@/$(PACKAGE_VERSION)/g; \
+ s/@PRIORITY@/$(PRIORITY)/g; \
+ s/@UNISON@/$(UNISON)/g; \
+ s/@UNISON_MAJ@/$(UNISON_MAJ)/g; \
+ s/@UNISON_PACKAGE@/$(UNISON_PACKAGE)/g; \
+ s/@UNISON_GTK@/$(UNISON_GTK)/g; \
+ s/@UNISON_GTK_PACKAGE@/$(UNISON_GTK_PACKAGE)/g; \
+ " $$i > \
$$DST; \
done
# We always need to rename the manual
- mv debian/unison$(PACKAGE_VERSION).1 debian/unison$(VERSION).1
+ mv debian/$(UNISON_PACKAGE).1 debian/$(UNISON).1
- $(MAKE) UISTYLE=gtk2 NATIVE=$(NATIVE) NAME=unison$(VERSION)-gtk
+ $(MAKE) UISTYLE=gtk2 NATIVE=$(NATIVE) NAME=$(UNISON_GTK)
- $(MAKE) UISTYLE=text NATIVE=$(NATIVE) NAME=unison$(VERSION)
+ $(MAKE) UISTYLE=text NATIVE=$(NATIVE) NAME=$(UNISON)
- env HOME=$(CURDIR) $(CURDIR)/unison$(VERSION) -doc all > $(CURDIR)/unison-manual.txt
+ env HOME=$(CURDIR) $(CURDIR)/$(UNISON) -doc all > $(CURDIR)/unison-manual.txt
- if [ "x$(NATIVE)" = "xtrue" ]; then \
- /usr/bin/chrpath -d unison$(VERSION)-gtk; \
+ if [ "x$(NATIVE)" = "xtrue" ]; then \
+ /usr/bin/chrpath -d $(UNISON_GTK); \
fi
touch build-stamp
@@ -65,12 +85,11 @@
# remove the renamed files
-for i in $(RENAME); do \
DST=$$i; \
- DST=$${DST/unison/unison$(PACKAGE_VERSION)}; \
+ DST=$${DST/unison/$(UNISON_PACKAGE)}; \
DST=$${DST%%.in}; \
$(RM) $$DST; \
done
- -$(RM) debian/unison$(VERSION).1
- -$(RM) unison$(VERSION)-manual.txt unison$(VERSION)-gtk unison$(VERSION)
+ -$(RM) debian/$(UNISON).1 unison-manual.txt $(UNISON_GTK) $(UNISON)
-$(MAKE) clean
dh_clean
@@ -79,14 +98,14 @@
dh_testroot
dh_clean -k
dh_installdirs
- install -o root -g root -m 755 unison$(VERSION) \
- $(CURDIR)/debian/unison$(PACKAGE_VERSION)/usr/bin
- install -o root -g root -m 755 unison$(VERSION)-gtk \
- $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/bin
- ln -s unison$(PACKAGE_VERSION) \
- $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/share/doc/unison$(PACKAGE_VERSION)-gtk
- ln -s unison$(VERSION).1.gz \
- $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/share/man/man1/unison$(VERSION)-gtk.1.gz
+ install -o root -g root -m 755 $(UNISON) \
+ $(CURDIR)/debian/$(UNISON_PACKAGE)/usr/bin
+ install -o root -g root -m 755 $(UNISON_GTK) \
+ $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/bin
+ ln -s $(UNISON_PACKAGE) \
+ $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/share/doc/$(UNISON_GTK_PACKAGE)
+ ln -s $(UNISON).1.gz \
+ $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/share/man/man1/$(UNISON_GTK).1.gz
binary-indep: build install
@@ -98,7 +117,7 @@
dh_installdocs
mv debian/unison.doc-base-in debian/unison.doc-base.in
dh_installmenu
- dh_installman debian/unison$(VERSION).1
+ dh_installman debian/$(UNISON).1
dh_installchangelogs NEWS
dh_compress
dh_fixperms
Modified: trunk/packages/unison/trunk/debian/unison-gtk.menu.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.menu.in 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/unison-gtk.menu.in 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,3 +1,3 @@
-?package(unison at PACKAGE_VERSION@-gtk):needs="x11" section="Apps/Net" \
- title="Unison @VERSION@ (GTK)" command="/usr/bin/unison at VERSION@-gtk" \
+?package(@UNISON_GTK_PACKAGE@):needs="x11" section="Apps/Net" \
+ title="Unison @VERSION@ (GTK)" command="/usr/bin/@UNISON_GTK@" \
longtitle="Unison @VERSION@ file synchronizer (GTK interface)"
Modified: trunk/packages/unison/trunk/debian/unison-gtk.postinst.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.postinst.in 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/unison-gtk.postinst.in 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-update-alternatives --install /usr/bin/unison-gtk unison-gtk /usr/bin/unison at VERSION@-gtk @PRIORITY@ \
- --slave /usr/share/man/man1/unison-gtk.1.gz unison-gtk.1.gz /usr/share/man/man1/unison at VERSION@-gtk.1.gz
+update-alternatives --install /usr/bin/unison-gtk unison-gtk /usr/bin/@UNISON_GTK@ @PRIORITY@ \
+ --slave /usr/share/man/man1/unison-gtk.1.gz unison-gtk.1.gz /usr/share/man/man1/@UNISON_GTK at .1.gz
#DEBHELPER#
Modified: trunk/packages/unison/trunk/debian/unison-gtk.prerm.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.prerm.in 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/unison-gtk.prerm.in 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,7 +1,7 @@
#!/bin/sh -e
if [ "$1" = "remove" ]; then
- update-alternatives --remove unison-gtk /usr/bin/unison at VERSION@-gtk
+ update-alternatives --remove unison-gtk /usr/bin/@UNISON_GTK@
fi
#DEBHELPER#
Modified: trunk/packages/unison/trunk/debian/unison.1.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.1.in 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/unison.1.in 2005-08-13 23:16:16 UTC (rev 1598)
@@ -2,7 +2,7 @@
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
-.TH UNISON at VERSION@ 1 "September 23, 2001"
+.TH @UNISON_MAJ@ 1 "September 23, 2001"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -16,27 +16,27 @@
.\" .sp <n> insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
-unison at VERSION@ \- a file-synchronization tool for Unix and Windows
+ at UNISON@ \- a file-synchronization tool for Unix and Windows
.SH SYNOPSIS
-.B unison at VERSION@
+.B @UNISON@
.RI [ options ]
.br
-.B unison at VERSION@
+.B @UNISON@
root1 root2
.RI [ options ]
.br
-.B unison at VERSION@
+.B @UNISON@
profilename
.RI [ options ]
.br
-.B unison at VERSION@-gtk
+.B @UNISON at -gtk
.RI [ options ]
.SH DESCRIPTION
This manual page briefly documents Unison, and was written for the
Debian GNU/Linux distribution because the original program does not
have a manual page. For a full description, please refer to the
-inbuilt documentation or the manuals in /usr/share/doc/unison at VERSION@/. The
-unison at VERSION@-gtk binary has similar command-line options, but allows the user
+inbuilt documentation or the manuals in /usr/share/doc/@UNISON_PACKAGE@/. The
+ at UNISON_GTK@ binary has similar command-line options, but allows the user
to select and create profiles and configure options from within the
program.
.PP
@@ -61,13 +61,13 @@
.SH OPTIONS
All Unison options are long, starting with one dash (`-') only.
A summary of options is included here. For a complete description,
-see the inbuilt documentation or the manuals in /usr/share/doc/unison at VERSION@/.
+see the inbuilt documentation or the manuals in /usr/share/doc/@UNISON_PACKAGE@/.
.TP
.B \-addprefsto
specify a file to add new preferences to in interactive mode
.TP
.B \-addversionno
-add version number to name of unison at VERSION@ executable on server
+add version number to name of @UNISON@ executable on server
.TP
.B \-auto
automatically accept default actions
@@ -213,7 +213,7 @@
accumulated into a list internally.
.SH SEE ALSO
The program is documented fully in the in-built documentation and the
-manual, available as HTML, PostScript and text in /usr/share/doc/unison at VERSION@/.
+manual, available as HTML, PostScript and text in /usr/share/doc/@UNISON_PACKAGE@/.
.SH AUTHOR
This manual page was written by Robert McQueen <robot101 at debian.org>,
for the Debian GNU/Linux system (but may be used by others).
Modified: trunk/packages/unison/trunk/debian/unison.doc-base.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.doc-base.in 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/unison.doc-base.in 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,4 +1,4 @@
-Document: unison at VERSION@-manual
+Document: @UNISON_PACKAGE at -manual
Title: Unison @VERSION@ Installation and Usage Manual
Author: Benjamin Pierce <bcpierce at cis.upenn.edu>
Abstract: Unison is a file-synchronization tool for Unix and
@@ -10,4 +10,4 @@
Section: Apps/Tools
Format: text
-Files: /usr/share/doc/unison at PACKAGE_VERSION@/unison-manual.txt.gz
+Files: /usr/share/doc/@UNISON_PACKAGE@/unison-manual.txt.gz
Modified: trunk/packages/unison/trunk/debian/unison.postinst.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.postinst.in 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/unison.postinst.in 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-update-alternatives --install /usr/bin/unison unison /usr/bin/unison at VERSION@ @PRIORITY@ \
- --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/unison at VERSION@.1.gz
+update-alternatives --install /usr/bin/unison unison /usr/bin/@UNISON@ @PRIORITY@ \
+ --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/@UNISON at .1.gz
#DEBHELPER#
Modified: trunk/packages/unison/trunk/debian/unison.prerm.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.prerm.in 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/unison.prerm.in 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,7 +1,7 @@
#!/bin/sh -e
if [ "$1" = "remove" ]; then
- update-alternatives --remove unison /usr/bin/unison at VERSION@
+ update-alternatives --remove unison /usr/bin/@UNISON@
fi
#DEBHELPER#
Modified: trunk/packages/unison/trunk/debian/utils/purify_unison
===================================================================
--- trunk/packages/unison/trunk/debian/utils/purify_unison 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/utils/purify_unison 2005-08-13 23:16:16 UTC (rev 1598)
@@ -24,8 +24,6 @@
chmod 644 $PACKAGE-$VERSION/INSTALL
chmod 644 $PACKAGE-$VERSION/Makefile.OCaml
-chmod 644 $PACKAGE-$VERSION/ubase/uprintf_new.ml
-chmod 644 $PACKAGE-$VERSION/ubase/uprintf_old.ml
tar czf $ORIG $PACKAGE-$VERSION/
rm -rf $PACKAGE-$VERSION
Modified: trunk/packages/unison/trunk/debian/watch
===================================================================
--- trunk/packages/unison/trunk/debian/watch 2005-08-13 21:09:31 UTC (rev 1597)
+++ trunk/packages/unison/trunk/debian/watch 2005-08-13 23:16:16 UTC (rev 1598)
@@ -1,2 +1,2 @@
-version=3
-http://www.cis.upenn.edu/~bcpierce/unison/download/stable/latest/THIS-IS-UNISON-([0-9\.]*)
+version=2
+http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-([0-9\.]*)\.tar\.gz
Deleted: trunk/packages/unison/trunk/unison_2.10.2.orig.tar.gz
===================================================================
(Binary files differ)
Added: trunk/packages/unison/trunk/unison_2.13.16.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/unison/trunk/unison_2.13.16.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list