[Pkg-ocaml-maint-commits] r1604 -
trunk/packages/unison/unison2.9.1/trunk/debian
Sylvain LE GALL
gildor-guest at costa.debian.org
Sun Aug 14 15:58:15 UTC 2005
Author: gildor-guest
Date: 2005-08-14 15:58:14 +0000 (Sun, 14 Aug 2005)
New Revision: 1604
Added:
trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.preinst.in
trunk/packages/unison/unison2.9.1/trunk/debian/unison.preinst.in
Modified:
trunk/packages/unison/unison2.9.1/trunk/debian/README.Debian
trunk/packages/unison/unison2.9.1/trunk/debian/changelog
trunk/packages/unison/unison2.9.1/trunk/debian/rules
trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.postinst.in
trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.prerm.in
trunk/packages/unison/unison2.9.1/trunk/debian/unison.dirs.in
trunk/packages/unison/unison2.9.1/trunk/debian/unison.postinst.in
trunk/packages/unison/unison2.9.1/trunk/debian/unison.prerm.in
Log:
Merge the update-alternatives with unison -- SLG
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/README.Debian
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/README.Debian 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/README.Debian 2005-08-14 15:58:14 UTC (rev 1604)
@@ -48,7 +48,7 @@
hold the latest release of Unison ( ie 2.11.0 ).
By this way, you should always be able to synchronise
-stable/testing/unstable system using unison ( the good version
+stable/testing/unstable system using unison ( the good version
of unison ).
-- Sylvain Le Gall <sylvain.le-gall at polytechnique.org> Mon, 25 Apr 2005 23:06:44 +0200
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/changelog
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/changelog 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/changelog 2005-08-14 15:58:14 UTC (rev 1604)
@@ -2,8 +2,12 @@
* Merge changes from unison package:
* Use the same binary version scheme as the "-addversionno" unison
- option
+ option
* Change the menu section to Apps/Tools
+ * Change the alternative system. User may encounter problems if the
+ alternative for unison or unison-gtk has been changed. Please run
+ "update-alternatives --auto unison && update-alternatives --auto
+ unison-gtk".
-- Sylvain Le Gall <sylvain.le-gall at polytechnique.org> Sun, 14 Aug 2005 01:53:40 +0200
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/rules
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/rules 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/rules 2005-08-14 15:58:14 UTC (rev 1604)
@@ -19,9 +19,11 @@
UNISON=unison-$(VERSION)
UNISON_MAJ=UNISON-$(VERSION)
UNISON_PACKAGE=unison$(PACKAGE_VERSION)
+UNISON_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON),unison-latest-stable)
UNISON_GTK=unison-$(VERSION)-gtk
UNISON_GTK_PACKAGE=$(UNISON_PACKAGE)-gtk
+UNISON_GTK_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON_GTK),unison-latest-stable-gtk)
# End of variable to be replaced
@@ -35,10 +37,12 @@
RENAME += debian/unison.docs.in
RENAME += debian/unison.postinst.in
RENAME += debian/unison.prerm.in
+RENAME += debian/unison.preinst.in
RENAME += debian/unison-gtk.dirs.in
RENAME += debian/unison-gtk.menu.in
RENAME += debian/unison-gtk.postinst.in
RENAME += debian/unison-gtk.prerm.in
+RENAME += debian/unison-gtk.preinst.in
build: build-stamp
build-stamp: patch-stamp
@@ -51,14 +55,16 @@
DST=$${DST/unison/$(UNISON_PACKAGE)}; \
DST=$${DST%%.in}; \
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; \
+ 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_ALTERNATIVE@/$(UNISON_ALTERNATIVE)/g; \
+ s/@UNISON_GTK@/$(UNISON_GTK)/g; \
+ s/@UNISON_GTK_PACKAGE@/$(UNISON_GTK_PACKAGE)/g; \
+ s/@UNISON_GTK_ALTERNATIVE@/$(UNISON_GTK_ALTERNATIVE)/g; \
" $$i > \
$$DST; \
done
@@ -66,7 +72,7 @@
# We always need to rename the manual
mv debian/$(UNISON_PACKAGE).1 debian/$(UNISON).1
- $(MAKE) UISTYLE=gtk2 NATIVE=$(NATIVE) NAME=$(UNISON_GTK)
+ $(MAKE) UISTYLE=gtk NATIVE=$(NATIVE) NAME=$(UNISON_GTK)
$(MAKE) UISTYLE=text NATIVE=$(NATIVE) NAME=$(UNISON)
@@ -106,6 +112,21 @@
$(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
+ # Creating symlink from binary to $(UNISON_ALTERNATIVE) and $(UNISON_GTK_ALTERNATIVE)
+ for i in \
+ $(CURDIR)/debian/$(UNISON_PACKAGE)/usr/bin/$(UNISON_ALTERNATIVE) \
+ $(CURDIR)/debian/$(UNISON_PACKAGE)/usr/share/man/man1/$(UNISON_ALTERNATIVE).1.gz \
+ $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/bin/$(UNISON_GTK_ALTERNATIVE) \
+ $(CURDIR)/debian/$(UNISON_GTK_PACKAGE)/usr/share/man/man1/$(UNISON_GTK_ALTERNATIVE).1.gz \
+ ; do \
+ FILENAME=$${i##*/}; \
+ FILENAME=$${FILENAME/$(UNISON_ALTERNATIVE)/$(UNISON)}; \
+ FILENAME=$${FILENAME/$(UNISON_GTK_ALTERNATIVE)/$(UNISON_GTK)}; \
+ if ! [ -e $$i ] && ! [ -L $$i ]; then \
+ ln -s $$FILENAME \
+ $$i; \
+ fi \
+ done
binary-indep: build install
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.postinst.in
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.postinst.in 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.postinst.in 2005-08-14 15:58:14 UTC (rev 1604)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-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
+update-alternatives --install /usr/bin/unison-gtk unison-gtk /usr/bin/@UNISON_GTK_ALTERNATIVE@ @PRIORITY@ \
+ --slave /usr/share/man/man1/unison-gtk.1.gz unison-gtk.1.gz /usr/share/man/man1/@UNISON_GTK_ALTERNATIVE at .1.gz
#DEBHELPER#
Copied: trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.preinst.in (from rev 1603, trunk/packages/unison/trunk/debian/unison-gtk.preinst.in)
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.prerm.in
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.prerm.in 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/unison-gtk.prerm.in 2005-08-14 15:58:14 UTC (rev 1604)
@@ -1,7 +1,7 @@
#!/bin/sh -e
-if [ "$1" = "remove" ]; then
- update-alternatives --remove unison-gtk /usr/bin/@UNISON_GTK@
+if [ "$1" = "remove" ]; then
+ update-alternatives --remove unison-gtk /usr/bin/@UNISON_GTK_ALTERNATIVE@
fi
#DEBHELPER#
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/unison.dirs.in
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/unison.dirs.in 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/unison.dirs.in 2005-08-14 15:58:14 UTC (rev 1604)
@@ -1 +1,2 @@
usr/bin
+usr/share/man/man1
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/unison.postinst.in
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/unison.postinst.in 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/unison.postinst.in 2005-08-14 15:58:14 UTC (rev 1604)
@@ -1,6 +1,6 @@
#!/bin/sh -e
-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
+update-alternatives --install /usr/bin/unison unison /usr/bin/@UNISON_ALTERNATIVE@ @PRIORITY@ \
+ --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/@UNISON_ALTERNATIVE at .1.gz
#DEBHELPER#
Copied: trunk/packages/unison/unison2.9.1/trunk/debian/unison.preinst.in (from rev 1603, trunk/packages/unison/trunk/debian/unison.preinst.in)
Modified: trunk/packages/unison/unison2.9.1/trunk/debian/unison.prerm.in
===================================================================
--- trunk/packages/unison/unison2.9.1/trunk/debian/unison.prerm.in 2005-08-14 15:28:57 UTC (rev 1603)
+++ trunk/packages/unison/unison2.9.1/trunk/debian/unison.prerm.in 2005-08-14 15:58:14 UTC (rev 1604)
@@ -1,7 +1,7 @@
#!/bin/sh -e
if [ "$1" = "remove" ]; then
- update-alternatives --remove unison /usr/bin/@UNISON@
+ update-alternatives --remove unison /usr/bin/@UNISON_ALTERNATIVE@
fi
#DEBHELPER#
More information about the Pkg-ocaml-maint-commits
mailing list