[Pkg-ocaml-maint-commits] r3563 - in /trunk/packages/unison/trunk/debian: changelog rules

[gildor at users.alioth.debian.org]

Author: gildor
Date: Thu Feb 15 22:31:21 2007
New Revision: 3563

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3563
Log:
* Some works on enabling CDBS
-- SLG

Modified:
    trunk/packages/unison/trunk/debian/changelog
    trunk/packages/unison/trunk/debian/rules

Modified: trunk/packages/unison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/changelog?rev=3563&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/changelog (original)
+++ trunk/packages/unison/trunk/debian/changelog Thu Feb 15 22:31:21 2007
@@ -1,19 +1,13 @@
-unison (2.13.16-7) UNRELEASED; urgency=low
+unison (2.13.16-6) UNRELEASED; 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),
-
- -- Sylvain Le Gall <gildor at debian.org>  Tue,  7 Nov 2006 00:00:19 +0100
-
-unison (2.13.16-6) unstable; urgency=low
-
+  * Add a not in README.Debian about removable media
   * Change my email address to gildor at debian.org,
-  * Made debian/control a PHONY target,
-  * Upgrade standards version to 3.7.2 (no change),
-
- -- Sylvain Le Gall <gildor at debian.org>  Wed, 14 Jun 2006 21:59:13 +0200
+
+ -- Sylvain Le Gall <gildor at debian.org>  Wed, 14 Feb 2007 00:05:35 +0100
 
 unison (2.13.16-5) unstable; urgency=low
 

Modified: trunk/packages/unison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/rules?rev=3563&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/rules (original)
+++ trunk/packages/unison/trunk/debian/rules Thu Feb 15 22:31:21 2007
@@ -24,12 +24,6 @@
 include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/class/ocaml.mk
-
-PACKAGE := unison
-DESTDIR := $(CURDIR)/debian/$(PACKAGE)
-
-PACKAGE_DEV := unison-dev
-DESTDIR_DEV := $(CURDIR)/debian/$(PACKAGE_DEV)
 
 DEB_MAKE_CLEAN_TARGET    := clean
 DEB_MAKE_BUILD_TARGET    := all 
@@ -52,6 +46,44 @@
 	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))
+
+ifeq ($(DEB_SOURCE_PACKAGE),unison)
+# latest package
+PACKAGE_VERSION=
+PRIORITY=20
+else
+# compatibility package
+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)
+
+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
+
 ##!/usr/bin/make -f
 #
 ## In order to use dpatch