[Pkg-ocaml-maint-commits] r4544 - in /trunk/packages/unison/trunk/debian: ./ patches/
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Thu Sep 20 14:49:37 UTC 2007
Author: gildor
Date: Thu Sep 20 14:49:37 2007
New Revision: 4544
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4544
Log:
* Full switch to CDBS
* Use .in files to replace most of the shell command in debian/rules
* Add .desktop
* Add icons
* Update README.Debian
Added:
trunk/packages/unison/trunk/debian/patches/01gtkfont.dpatch
trunk/packages/unison/trunk/debian/unison-gtk.install.in
trunk/packages/unison/trunk/debian/unison-gtk.links.in
trunk/packages/unison/trunk/debian/unison-gtk.svg.in
trunk/packages/unison/trunk/debian/unison.install.in
trunk/packages/unison/trunk/debian/unison.links.in
Modified:
trunk/packages/unison/trunk/debian/README.Debian
trunk/packages/unison/trunk/debian/changelog
trunk/packages/unison/trunk/debian/control
trunk/packages/unison/trunk/debian/control.in
trunk/packages/unison/trunk/debian/copyright
trunk/packages/unison/trunk/debian/patches/00list
trunk/packages/unison/trunk/debian/rules
trunk/packages/unison/trunk/debian/unison-gtk.desktop.in
trunk/packages/unison/trunk/debian/unison-gtk.menu.in
trunk/packages/unison/trunk/debian/unison-gtk.postinst.in
Modified: trunk/packages/unison/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/README.Debian?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/README.Debian (original)
+++ trunk/packages/unison/trunk/debian/README.Debian Thu Sep 20 14:49:37 2007
@@ -29,27 +29,29 @@
This package has been split when Unison 2.10.2 was released.
There now exist now versions of the package :
- unison, unison-gtk ( version 2.10.2 )
-- unison2.9.1, unison2.9.1-gtk ( version 2.9.1 )
+- unison2.9.1, unison2.9.1-gtk (version 2.9.1)
-The reason for this split is to preserve protocol
-compatibility with actual stable release of debian (ie Woody).
-By this way, you can install unison and synchronise
-testing/unstable systems or install unison2.9.1 and
-synchronise testing/unstable with stable systems.
+The reason for this split is to preserve protocol compatibility with actual
+stable release of debian (e.g. Woody or Sarge or Etch). By this way, you can
+install unison and synchronise testing/unstable systems or install unison2.9.1
+and synchronise testing/unstable with stable systems.
-You can install both unison and unison2.9.1, an alternative
-system is used ( see "man update-alternatives" ).
+You can install both unison and unison2.9.1, an alternative system is used (see
+"man update-alternatives").
-When the stable release will contain unison 2.10.2,
-unison2.9.1 will be removed. When a new stable release of
-unison will come ( for example unison 2.11.0 ) a package
-unison2.10.2 will be created to be able to synchronise with the
-future stable release of debian. The package unison will then
-hold the latest release of Unison ( ie 2.11.0 ).
+When the stable release will contain unison 2.10.2, unison2.9.1 will be
+removed. When a new stable release of unison will come (for example unison
+2.11.0) a package unison2.10.2 will be created to be able to synchronise with
+the future stable release of debian. The package unison will then hold the
+latest release of Unison (e.g. 2.11.0).
-By this way, you should always be able to synchronise
-stable/testing/unstable system using unison ( the good version
-of unison ).
+By this way, you should always be able to synchronise stable/testing/unstable
+system using unison (the good version of unison).
+
+This scheme continue to apply further (unison 2.13.16 was released in unison
+package and unison2.9.1 was keep in Etch/Sid while Sarge was stable).
+
+Etch is now released with unison 2.13.16, so unison2.9.1 will be removed.
-- Sylvain Le Gall <gildor at debian.org> Mon, 25 Apr 2005 23:06:44 +0200
@@ -89,3 +91,23 @@
why unison keep asking you what you really want to do.
-- Sylvain Le Gall <gildor at debian.org> Thu, 15 Feb 2007 22:12:48 +0100
+
+#----------------------#
+# unison-latest-stable #
+#----------------------#
+
+The package unison provide a link to the latest stable version of unison. This
+link is here to help people not asking themselves what is the latest stable
+version of unison.
+
+In package provided for compatibility reason (unison2.9.1 for example) such a link
+doesn't exists.
+
+If you use unison-latest-stable, you are sure to use the most up-to-date stable
+version of unison.
+
+Moreover, using a constant name help "update-alternatives" not to get lost when
+upgrading the package from major version to major version (when the version
+of unison change).
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 20 Sep 2007 15:58:53 +0200
Modified: trunk/packages/unison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/changelog?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/changelog (original)
+++ trunk/packages/unison/trunk/debian/changelog Thu Sep 20 14:49:37 2007
@@ -1,14 +1,27 @@
-unison (2.13.16-7) UNRELEASED; urgency=low
+unison (2.13.16-7) unstable; urgency=low
* Upgrade debian/watch version to 3,
* Upgrade debhelper debian/compat to 5,
* Use CDBS for debian/rules,
- * Add debian/unison-gtk.desktop.in (TO COMPLETE),
- * Add a not in README.Debian about removable media
+ * Add debian/unison-gtk.desktop.in (Closes: #387666, #422495),
+ * Add a note in README.Debian about removable media
* Change my email address to gildor at debian.org,
* Change email address to gildor at debian.org everywhere
-
- -- Sylvain Le Gall <gildor at debian.org> Thu, 21 Jun 2007 23:13:03 +0100
+ * Rebuild for ocaml 3.10.0
+ * Add icons for unison-gtk
+ * Use ocamlopt.opt when possible
+ * Provide a link from unison to unison-2.13 to work with
+ "addversionno = true" (Closes: #368418, #392099)
+ * Apply patche 01gtkfont to stop trying to use deprecated
+ font setting, thanks to Norman Ramsey (Closes: #372545)
+ * Add a note on what unison-latest-stable is supposed to do in
+ README.Debian (Closes: #361900), in the same time explain failure
+ when trying to upgrade with update-alternatives (Closes: #335413)
+ * unison-gtk is now an alternative to unison (Closes: #411297)
+ * change stable release codename to Etch in README.Debian
+ (Closes: #394738)
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 20 Sep 2007 15:58:53 +0200
unison (2.13.16-6) unstable; urgency=low
Modified: trunk/packages/unison/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/control?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/control (original)
+++ trunk/packages/unison/trunk/debian/control Thu Sep 20 14:49:37 2007
@@ -2,14 +2,14 @@
Section: net
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), liblablgtk2-ocaml-dev, chrpath
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), liblablgtk2-ocaml-dev, chrpath, librsvg2-bin, imagemagick
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/unison
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/
Package: unison
Architecture: any
-Depends: ${shlibs:Depends}, ${interpreter:Depends}
+Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}
Recommends: ssh-client | openssh-client
Conflicts: unison (<< 2.9.1-3)
Description: A file-synchronization tool for Unix and Windows
@@ -34,7 +34,7 @@
Package: unison-gtk
Architecture: any
-Depends: ${shlibs:Depends}, ${interpreter:Depends}
+Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}
Conflicts: unison-gtk (<< 2.9.1-3)
Recommends: ssh-askpass, ssh-client | openssh-client
Description: A file-synchronization tool for Unix and Windows - GTK interface
Modified: trunk/packages/unison/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/control.in?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/control.in (original)
+++ trunk/packages/unison/trunk/debian/control.in Thu Sep 20 14:49:37 2007
@@ -2,14 +2,14 @@
Section: net
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: @cdbs@, liblablgtk2-ocaml-dev, chrpath
+Build-Depends: @cdbs@, liblablgtk2-ocaml-dev, chrpath, librsvg2-bin, imagemagick
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/unison
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/
Package: unison
Architecture: any
-Depends: ${shlibs:Depends}, ${interpreter:Depends}
+Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}
Recommends: ssh-client | openssh-client
Conflicts: unison (<< 2.9.1-3)
Description: A file-synchronization tool for Unix and Windows
@@ -34,7 +34,7 @@
Package: unison-gtk
Architecture: any
-Depends: ${shlibs:Depends}, ${interpreter:Depends}
+Depends: ${shlibs:Depends}, ${F:OCamlInterpreter}
Conflicts: unison-gtk (<< 2.9.1-3)
Recommends: ssh-askpass, ssh-client | openssh-client
Description: A file-synchronization tool for Unix and Windows - GTK interface
Modified: trunk/packages/unison/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/copyright?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/copyright (original)
+++ trunk/packages/unison/trunk/debian/copyright Thu Sep 20 14:49:37 2007
@@ -20,3 +20,24 @@
On Debian systems, the complete text of the GNU General Public
License can be found in /usr/share/common-licenses/GPL file.
+
+
+debian/unison-gtk.svg:
+Copyright (c) 2007 Eric Lavarde
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
+
+
+
+
Modified: trunk/packages/unison/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/patches/00list?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/patches/00list (original)
+++ trunk/packages/unison/trunk/debian/patches/00list Thu Sep 20 14:49:37 2007
@@ -1,1 +1,1 @@
-
+01gtkfont
Added: trunk/packages/unison/trunk/debian/patches/01gtkfont.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/patches/01gtkfont.dpatch?rev=4544&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/patches/01gtkfont.dpatch (added)
+++ trunk/packages/unison/trunk/debian/patches/01gtkfont.dpatch Thu Sep 20 14:49:37 2007
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01gtkfont.dpatch by <nr at eecs.harvard.edu>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Work around broken (and deprecated) GdkFont function
+
+ at DPATCH@
+Index: uigtk2.ml
+===================================================================
+--- unison/uigtk2.ml (revision 163)
++++ unison/uigtk2.ml (working copy)
+@@ -514,7 +514,7 @@
+ ignore (lst#append ["Data received"]);
+ ignore (lst#append ["File data written"]);
+ let style = lst#misc#style#copy in
+- style#set_font (Lazy.force fontMonospaceMedium);
++ (* style#set_font (Lazy.force fontMonospaceMedium); *)
+ for r = 0 to 2 do
+ lst#set_row ~selectable:false r;
+ for c = 1 to 3 do
Modified: trunk/packages/unison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/rules?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/rules (original)
+++ trunk/packages/unison/trunk/debian/rules Thu Sep 20 14:49:37 2007
@@ -22,53 +22,35 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/class/ocaml.mk
-DEB_MAKE_CLEAN_TARGET := clean
-DEB_MAKE_BUILD_TARGET := all
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET += opt
-endif
-DEB_MAKE_INSTALL_TARGET := install DESTDIR="$(DESTDIR_DEV)"
-
-CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.09.2-7),$(CDBS_BUILD_DEPENDS))
-
-clean::
- -$(RM) lib/com.cmxa lib/com.a lib/com.o
- -$(RM) config/Makefile
-
-common-configure-indep common-configure-arch::
- cp config/Makefile.unix config/Makefile
-
-install/libunison-ocaml-dev::
- $(RM) -r $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/stublibs
- mv $(DESTDIR_DEV)/$(OCAML_STDLIB_DIR)/gsl/*.so \
- $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/
- chrpath -d $(DESTDIR)/$(OCAML_STDLIB_DIR)/stublibs/*.so
-
-# Variable replacement in .in file
-
-VERSION=$(patsubst -%,,$(DEBIAN_VERSION))
+VERSION=$(DEB_UPSTREAM_VERSION)
+# version used with addversionno in unison
+VERSIONNO=$(shell echo $(VERSION) | cut -f 1-2 -d .)
ifeq ($(DEB_SOURCE_PACKAGE),unison)
# latest package
PACKAGE_VERSION=
PRIORITY=20
+# unison-gtk can replaced unison
+PRIORITY_GTK=15
else
# compatibility package
PACKAGE_VERSION=$(VERSION)
PRIORITY=10
+PRIORITY_GTK=5
endif
UNISON=unison-$(VERSION)
UNISON_MAJ=UNISON-$(VERSION)
UNISON_PACKAGE=unison$(PACKAGE_VERSION)
UNISON_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON),unison-latest-stable)
+UNISON_VERSIONNO=unison-$(VERSIONNO)
UNISON_GTK=unison-$(VERSION)-gtk
UNISON_GTK_PACKAGE=$(UNISON_PACKAGE)-gtk
UNISON_GTK_ALTERNATIVE=$(if $(PACKAGE_VERSION),$(UNISON_GTK),unison-latest-stable-gtk)
+UNISON_GTK_VERSIONNO=unison-$(VERSIONNO)-gtk
RENAME := debian/unison.1.in
RENAME += debian/unison.dirs.in
@@ -83,179 +65,118 @@
RENAME += debian/unison-gtk.prerm.in
RENAME += debian/unison-gtk.preinst.in
RENAME += debian/unison-gtk.manpages.in
+RENAME += debian/unison-gtk.svg.in
+RENAME += debian/unison-gtk.install.in
+RENAME += debian/unison.install.in
+RENAME += debian/unison-gtk.links.in
+RENAME += debian/unison.links.in
+RENAME += debian/unison-gtk.desktop.in
-##!/usr/bin/make -f
+MY_MAKE_FLAGS += $(shell test -x /usr/bin/ocamlopt.opt && echo "OCAMLOPT=ocamlopt.opt")
+
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+ NATIVE := true
+ DEB_DH_GENCONTROL_ARGS += -VF:OCamlInterpreter=""
+else
+ NATIVE := false
+ DEB_DH_GENCONTROL_ARGS += -VF:OCamlInterpreter="ocaml-base-$(OCAML_ABI)"
+ DEB_STRIP_EXCLUDE := $(UNISON) $(UNISON_GTK)
+endif
+
+UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || echo gtk2)
+
+CDBS_BUILD_DEPENDS := $(subst ocaml-nox,ocaml-nox (>= 3.10.0-8),$(CDBS_BUILD_DEPENDS))
+
+DEB_INSTALL_DOCS_ALL := BUGS.txt TODO.txt unison-manual.txt -X unison.doc-base.in
+
+DEB_INSTALL_CHANGELOGS_ALL := NEWS
+
#
-## In order to use dpatch
-#include /usr/share/dpatch/dpatch.make
+# Build unison
#
-#OCAMLABI=$(shell ocamlc -version)
+
+configure::
+ cp config/Makefile.unix config/Makefile
+
+build/$(UNISON_PACKAGE)::
+ $(MAKE) UISTYLE=text NATIVE=$(NATIVE) $(MY_MAKE_FLAGS)
+ mv '$(CURDIR)/unison' '$(CURDIR)/$(UNISON)'
+ env HOME='$(CURDIR)' '$(CURDIR)/$(UNISON)' -doc all > '$(CURDIR)/unison-manual.txt'
+
+build/$(UNISON_GTK_PACKAGE):: debian/$(UNISON_GTK_PACKAGE).xpm
+ $(MAKE) UISTYLE=$(UISTYLE) NATIVE=$(NATIVE) $(MY_MAKE_FLAGS)
+ mv '$(CURDIR)/unison' '$(CURDIR)/$(UNISON_GTK)'
+ test 'x$(OCAML_HAVE_OCAMLOPT)' = 'xyes' && /usr/bin/chrpath -d '$(CURDIR)/$(UNISON_GTK)'
+
+clean::
+ -$(RM) '$(CURDIR)/unison-manual.txt'
+ -$(RM) '$(CURDIR)/$(UNISON_GTK)'
+ -$(RM) '$(CURDIR)/$(UNISON)'
+ $(MAKE) clean
+
+binary-install/$(UNISON_GTK_PACKAGE)::
+ dh_desktop -p$(UNISON_GTK_PACKAGE)
+
#
-#PACKAGE=$(shell dpkg-parsechangelog | awk "/Source: .*/ { gsub(\"Source: \",\"\"); print }")
+# Unison icons
#
-## Variable that will be replaced in files
+
+
+debian/$(UNISON_GTK_PACKAGE).png: debian/unison-gtk.svg.in
+ rsvg -f png -w 32 -h 32 $^ $@
+
+debian/$(UNISON_GTK_PACKAGE).xpm: debian/$(UNISON_GTK_PACKAGE).png
+ convert $^ $@
+
+clean::
+ -$(RM) '$(CURDIR)/debian/$(UNISON_GTK_PACKAGE).png'
+ -$(RM) '$(CURDIR)/debian/$(UNISON_GTK_PACKAGE).xpm'
+
#
-#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
+# Rename and substitute files
#
-## PRIORITY should be set to 10 for stable compatibility package
-## and to 20 for unstable/testing package
-#
-#ifeq ($(PACKAGE),unison)
-#PACKAGE_VERSION=
-#PRIORITY=20
-#else
-#PACKAGE_VERSION=$(VERSION)
-#PRIORITY=10
-#endif
-#
-#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
-#
-## 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)
-#UISTYLE := $(shell dpkg --compare-versions 2.10 ge $(VERSION) && echo gtk || echo gtk2)
-#
-## which file to rename for following the version
-#RENAME := debian/unison.1.in
-#RENAME += debian/unison.dirs.in
-#RENAME += debian/unison.doc-base.in
-#RENAME += debian/unison.postinst.in
-#RENAME += debian/unison.prerm.in
-#RENAME += debian/unison.preinst.in
-#RENAME += debian/unison.manpages.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
-#RENAME += debian/unison-gtk.manpages.in
-#
-#debian/control: debian/control.in
-# sed -e 's%#OCamlABI#%$(OCAMLABI)%' $@.in >$@
-#
-#build: build-stamp
-#build-stamp: patch-stamp
-# dh_testdir
-#
-# # rename all the debhelper files needed and substitue the @VERSION@
-# # string
-# for i in $(RENAME); do \
-# DST=$$i; \
-# DST=`echo $$DST | sed "s/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_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
-#
-# # We always need to rename the manual
-# mv debian/$(UNISON_PACKAGE).1 debian/$(UNISON).1
-# # We copy unison.1 to unison-gtk.1
-# cp debian/$(UNISON).1 debian/$(UNISON_GTK).1
-#
-# $(MAKE) UISTYLE=$(UISTYLE) NATIVE=$(NATIVE)
-# mv unison $(UNISON_GTK)
-#
-# $(MAKE) UISTYLE=text NATIVE=$(NATIVE)
-# mv unison $(UNISON)
-#
-# env HOME=$(CURDIR) $(CURDIR)/$(UNISON) -doc all > $(CURDIR)/unison-manual.txt
-#
-# if [ "x$(NATIVE)" = "xtrue" ]; then \
-# /usr/bin/chrpath -d $(UNISON_GTK); \
-# fi
-#
-# touch build-stamp
-#
-#clean: unpatch
-# dh_testdir
-# dh_testroot
-# -$(RM) build-stamp configure-stamp
-# # remove the renamed files
-# -for i in $(RENAME); do \
-# DST=$$i; \
-# DST=$${DST/unison/$(UNISON_PACKAGE)}; \
-# DST=$${DST%%.in}; \
-# $(RM) $$DST; \
-# done
-# -$(RM) debian/$(UNISON).1 debian/$(UNISON_GTK).1 unison-manual.txt $(UNISON_GTK) $(UNISON)
-# -$(MAKE) clean
-# dh_clean
-#
-#install: build
-# dh_testdir
-# dh_testroot
-# dh_clean -k
-# dh_installdirs
-# 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
-# # 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
-#
-#binary-arch: build install
-# dh_testdir -a
-# dh_testroot -a
-# # Move temporarly the doc-base.in because dh_installdocs will take it into consideration
-# mv debian/unison.doc-base.in debian/unison.doc-base-in
-# dh_installdocs -a -A BUGS.txt TODO.txt unison-manual.txt
-# mv debian/unison.doc-base-in debian/unison.doc-base.in
-# dh_installmenu -a
-# dh_installman -a
-# dh_installchangelogs -a -A NEWS
-# dh_compress -a
-# dh_fixperms -a
-# dh_installdeb -a
-# dh_shlibdeps -a
-# if [ "x$(NATIVE)" = "xtrue" ]; then\
-# for i in debian/*.substvars; do \
-# echo "interpreter:Depends=" >> $$i;\
-# done;\
-# dh_strip -a;\
-# else\
-# for i in debian/*.substvars; do \
-# echo "interpreter:Depends=ocaml-base-$(OCAMLABI)" >> $$i;\
-# done;\
-# fi
-# dh_gencontrol -a -- -VF:OCamlABI="$(OCAMLABI)"
-# dh_md5sums -a
-# dh_builddeb -a
-#
-#binary: binary-indep binary-arch
-#.PHONY: build clean binary-indep binary-arch binary install configure debian/control
+
+unison-rename: unison-rename-stamp
+unison-rename-stamp:
+ # Rename all the debhelper files needed and substitue the @XXX@
+ # string
+ for i in $(RENAME); do \
+ DST=`echo $$i | sed -e "s/unison/${UNISON_PACKAGE}/" -e "s/\\.in\\$$//"`; \
+ sed \
+ -e "s/@VERSION@/$(VERSION)/g" \
+ -e "s/@PACKAGE_VERSION@/$(PACKAGE_VERSION)/g" \
+ -e "s/@PRIORITY@/$(PRIORITY)/g" \
+ -e "s/@PRIORITY_GTK@/$(PRIORITY_GTK)/g" \
+ -e "s/@UNISON@/$(UNISON)/g" \
+ -e "s/@UNISON_MAJ@/$(UNISON_MAJ)/g" \
+ -e "s/@UNISON_PACKAGE@/$(UNISON_PACKAGE)/g" \
+ -e "s/@UNISON_ALTERNATIVE@/$(UNISON_ALTERNATIVE)/g" \
+ -e "s/@UNISON_VERSIONNO@/$(UNISON_VERSIONNO)/g" \
+ -e "s/@UNISON_GTK@/$(UNISON_GTK)/g" \
+ -e "s/@UNISON_GTK_PACKAGE@/$(UNISON_GTK_PACKAGE)/g" \
+ -e "s/@UNISON_GTK_ALTERNATIVE@/$(UNISON_GTK_ALTERNATIVE)/g" \
+ -e "s/@UNISON_GTK_VERSIONNO@/$(UNISON_GTK_VERSIONNO)/g" \
+ "$$i" > "$(CURDIR)/$$DST"; \
+ done
+
+ # We always need to rename the manual
+ cp '$(CURDIR)/debian/$(UNISON_PACKAGE).1' '$(CURDIR)/debian/$(UNISON).1'
+ # We copy unison.1 to unison-gtk.1
+ cp '$(CURDIR)/debian/$(UNISON).1' '$(CURDIR)/debian/$(UNISON_GTK).1'
+
+ touch $@
+
+.PHONY: unison-rename
+
+common-binary-indep:: unison-rename
+common-binary-arch:: unison-rename
+
+clean::
+ # Remove the renamed files
+ -for i in $(RENAME); do \
+ DST=`echo $$i | sed -e "s/unison/${UNISON_PACKAGE}/" -e "s/\\.in\\$$//"`; \
+ $(RM) "$(CURDIR)/$$DST"; \
+ done
+ -$(RM) '$(CURDIR)/debian/$(UNISON).1'
+ -$(RM) '$(CURDIR)/debian/$(UNISON_GTK).1'
+ -$(RM) '$(CURDIR)/unison-rename-stamp'
Modified: trunk/packages/unison/trunk/debian/unison-gtk.desktop.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison-gtk.desktop.in?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.desktop.in (original)
+++ trunk/packages/unison/trunk/debian/unison-gtk.desktop.in Thu Sep 20 14:49:37 2007
@@ -1,11 +1,13 @@
[Desktop Entry]
-Version=1.0
Encoding=UTF-8
+Name=Unison
+Comment=GTK interface for the unison file synchronization tool @VERSION@
+GenericName=File synchronization tool
+Exec=@UNISON_GTK@
+Terminal=false
+X-MultipleArgs=false
Type=Application
-Name=MLDonkey
-Comment=Graphical frontend for MLDonkey
-Comment[fr]=Interface graphique pour MLDonkey
-TryExec=mlgui
-Exec=mlgui
-Icon=mlgui.xpm
-Categories=GTK;Application;Network;
+Icon=@UNISON_GTK_PACKAGE at .svg
+Categories=Utility;FileTools;GTK;
+StartupWMClass=Unison-gtk
+StartupNotify=true
Added: trunk/packages/unison/trunk/debian/unison-gtk.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison-gtk.install.in?rev=4544&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.install.in (added)
+++ trunk/packages/unison/trunk/debian/unison-gtk.install.in Thu Sep 20 14:49:37 2007
@@ -1,0 +1,4 @@
+debian/@UNISON_GTK_PACKAGE at .xpm /usr/share/pixmaps/
+debian/@UNISON_GTK_PACKAGE at .svg /usr/share/pixmaps/
+ at UNISON_GTK@ /usr/bin/
+debian/@UNISON_GTK_PACKAGE at .desktop /usr/share/applications/
Added: trunk/packages/unison/trunk/debian/unison-gtk.links.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison-gtk.links.in?rev=4544&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.links.in (added)
+++ trunk/packages/unison/trunk/debian/unison-gtk.links.in Thu Sep 20 14:49:37 2007
@@ -1,0 +1,4 @@
+usr/bin/@UNISON_GTK@ usr/bin/@UNISON_GTK_ALTERNATIVE@
+usr/bin/@UNISON_GTK@ usr/bin/@UNISON_GTK_VERSIONNO@
+usr/share/man/man1/@UNISON_GTK at .1.gz usr/share/man/man1/@UNISON_GTK_ALTERNATIVE at .1.gz
+usr/share/man/man1/@UNISON_GTK at .1.gz usr/share/man/man1/@UNISON_GTK_VERSIONNO at .1.gz
Modified: trunk/packages/unison/trunk/debian/unison-gtk.menu.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison-gtk.menu.in?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.menu.in (original)
+++ trunk/packages/unison/trunk/debian/unison-gtk.menu.in Thu Sep 20 14:49:37 2007
@@ -1,3 +1,4 @@
-?package(@UNISON_GTK_PACKAGE@):needs="x11" section="Apps/Tools" \
+?package(@UNISON_GTK_PACKAGE@):needs="x11" section="Applications/File Management" \
title="Unison @VERSION@ (GTK)" command="/usr/bin/@UNISON_GTK@" \
- longtitle="Unison @VERSION@ file synchronizer (GTK interface)"
+ longtitle="Unison @VERSION@ file synchronizer (GTK interface)" \
+ icon="/usr/share/pixmaps/@UNISON_GTK_PACKAGE at .xpm"
Modified: trunk/packages/unison/trunk/debian/unison-gtk.postinst.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison-gtk.postinst.in?rev=4544&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.postinst.in (original)
+++ trunk/packages/unison/trunk/debian/unison-gtk.postinst.in Thu Sep 20 14:49:37 2007
@@ -3,4 +3,7 @@
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
+update-alternatives --install /usr/bin/unison unison /usr/bin/@UNISON_GTK_ALTERNATIVE@ @PRIORITY@ \
+ --slave /usr/share/man/man1/unison.1.gz unison.1.gz /usr/share/man/man1/@UNISON_GTK_ALTERNATIVE at .1.gz
+
#DEBHELPER#
Added: trunk/packages/unison/trunk/debian/unison-gtk.svg.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison-gtk.svg.in?rev=4544&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.svg.in (added)
+++ trunk/packages/unison/trunk/debian/unison-gtk.svg.in Thu Sep 20 14:49:37 2007
@@ -1,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48"
+ height="48"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.44.1"
+ sodipodi:docbase="/home/ericl/tmp"
+ sodipodi:docname="Unison.svg"
+ version="1.0">
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4637">
+ <stop
+ id="stop4639"
+ offset="0"
+ style="stop-color:yellow;stop-opacity:1;" />
+ <stop
+ style="stop-color:yellow;stop-opacity:1;"
+ offset="0.5"
+ id="stop4649" />
+ <stop
+ style="stop-color:#f30;stop-opacity:1;"
+ offset="1"
+ id="stop4645" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4637"
+ id="linearGradient4635"
+ x1="59.919643"
+ y1="257.14285"
+ x2="59.919643"
+ y2="307.51785"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.886245,0,0,0.886245,-29.10345,-226.2135)" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7.875"
+ inkscape:cx="24"
+ inkscape:cy="24"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ inkscape:window-width="902"
+ inkscape:window-height="583"
+ inkscape:window-x="391"
+ inkscape:window-y="139"
+ width="48px"
+ height="48px" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Unison Logo</dc:title>
+ <dc:date>2007-05-01</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Eric Lavarde</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Benjamin C. Pierce, Jérôme Vouillon, S. Balasubramaniam</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:description>The U with arrow ends and yellow/red gradient from Unison</dc:description>
+ <dc:coverage>The Unison File Synchronizer Project or any packaging effort of Unison offering free access to the package sources</dc:coverage>
+ <dc:relation>http://www.cis.upenn.edu/~bcpierce/unison/Unison.gif</dc:relation>
+ <dc:rights>
+ <cc:Agent>
+ <dc:title>The Unison File Synchronizer Project</dc:title>
+ </cc:Agent>
+ </dc:rights>
+ <dc:language>N/A</dc:language>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>Unison</rdf:li>
+ <rdf:li>Synchronizer</rdf:li>
+ <rdf:li>Logo</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>Eric Lavarde</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:identifier>http://eric.lavar.de/comp/unison/Unison.svg</dc:identifier>
+ <dc:source>http://eric.lavar.de/comp/unison/Unison.svg</dc:source>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <path
+ style="font-size:70.22288513px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient4635);fill-opacity:1;stroke:black;stroke-width:0.88624346px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Eras"
+ d="M 12.921958,2.1208664 L 5.8320104,9.349289 L 6.7182538,10.235533 L 8.2414846,10.235533 L 8.2414846,33.831765 C 8.2414846,34.063535 8.2573128,33.588127 8.2573128,33.819898 C 8.2573041,41.584443 15.516984,45.879134 23.529183,45.879134 C 34.454898,45.879134 39.675429,42.107983 39.675429,33.416336 L 39.675429,10.235533 L 41.281745,10.235533 L 42.16799,9.349289 L 35.078042,2.1208664 L 27.988095,9.349289 L 28.874338,10.235533 L 30.480655,10.235533 L 30.369875,33.416336 C 30.369875,41.296751 26.138665,42.1126 23.529183,42.1126 C 20.931382,42.112591 17.325479,41.702376 17.325479,33.416336 L 17.325479,10.235533 L 19.125662,10.235533 L 20.011905,9.349289 L 12.921958,2.1208664 z "
+ id="text2847"
+ sodipodi:nodetypes="cccccsscccccccccsccccc" />
+ </g>
+</svg>
Added: trunk/packages/unison/trunk/debian/unison.install.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison.install.in?rev=4544&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/unison.install.in (added)
+++ trunk/packages/unison/trunk/debian/unison.install.in Thu Sep 20 14:49:37 2007
@@ -1,0 +1,1 @@
+ at UNISON@ /usr/bin/
Added: trunk/packages/unison/trunk/debian/unison.links.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison.links.in?rev=4544&op=file
==============================================================================
--- trunk/packages/unison/trunk/debian/unison.links.in (added)
+++ trunk/packages/unison/trunk/debian/unison.links.in Thu Sep 20 14:49:37 2007
@@ -1,0 +1,4 @@
+usr/bin/@UNISON@ usr/bin/@UNISON_ALTERNATIVE@
+usr/bin/@UNISON@ usr/bin/@UNISON_VERSIONNO@
+usr/share/man/man1/@UNISON at .1.gz usr/share/man/man1/@UNISON_ALTERNATIVE at .1.gz
+usr/share/man/man1/@UNISON at .1.gz usr/share/man/man1/@UNISON_VERSIONNO at .1.gz
More information about the Pkg-ocaml-maint-commits
mailing list