[Pkg-ocaml-maint-commits] r3571 - in
/trunk/packages/unison/trunk/debian: changelog compat control
control.in rules unison-gtk.desktop.in watch
gildor at users.alioth.debian.org
gildor at users.alioth.debian.org
Thu Feb 15 23:03:51 CET 2007
Author: gildor
Date: Thu Feb 15 23:03:50 2007
New Revision: 3571
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=3571
Log:
* Switch back to my CDBS working version
-- SLG
Added:
trunk/packages/unison/trunk/debian/unison-gtk.desktop.in
- copied unchanged from r3563, trunk/packages/unison/trunk/debian/unison-gtk.desktop.in
Modified:
trunk/packages/unison/trunk/debian/changelog
trunk/packages/unison/trunk/debian/compat
trunk/packages/unison/trunk/debian/control
trunk/packages/unison/trunk/debian/control.in
trunk/packages/unison/trunk/debian/rules
trunk/packages/unison/trunk/debian/watch
Modified: trunk/packages/unison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/changelog?rev=3571&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/changelog (original)
+++ trunk/packages/unison/trunk/debian/changelog Thu Feb 15 23:03:50 2007
@@ -1,3 +1,14 @@
+unison (2.13.16-7) 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),
+ * Add a not in README.Debian about removable media
+ * Change my email address to gildor at debian.org,
+
+ -- Sylvain Le Gall <gildor at debian.org> Wed, 14 Feb 2007 00:05:35 +0100
+
unison (2.13.16-6) unstable; urgency=low
* Add a note in README.Debian concerning the use of removable media
Modified: trunk/packages/unison/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/compat?rev=3571&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/compat (original)
+++ trunk/packages/unison/trunk/debian/compat Thu Feb 15 23:03:50 2007
@@ -1,1 +1,1 @@
-4
+5
Modified: trunk/packages/unison/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/control?rev=3571&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/control (original)
+++ trunk/packages/unison/trunk/debian/control Thu Feb 15 23:03:50 2007
@@ -2,8 +2,9 @@
Section: net
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= 3.09.2), liblablgtk2-ocaml-dev, dpatch, chrpath
-Standards-Version: 3.6.2.0
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.09.2-7), liblablgtk2-ocaml-dev, chrpath
+Standards-Version: 3.7.2
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/unison
Package: unison
Architecture: any
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=3571&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/control.in (original)
+++ trunk/packages/unison/trunk/debian/control.in Thu Feb 15 23:03:50 2007
@@ -2,8 +2,9 @@
Section: net
Priority: optional
Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox (>= #OCamlABI#), liblablgtk2-ocaml-dev, dpatch, chrpath
-Standards-Version: 3.6.2.0
+Build-Depends: @cdbs@, liblablgtk2-ocaml-dev, chrpath
+Standards-Version: 3.7.2
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/unison
Package: unison
Architecture: any
Modified: trunk/packages/unison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/rules?rev=3571&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/rules (original)
+++ trunk/packages/unison/trunk/debian/rules Thu Feb 15 23:03:50 2007
@@ -1,24 +1,62 @@
#!/usr/bin/make -f
-
-# In order to use dpatch
-include /usr/share/dpatch/dpatch.make
-OCAMLABI=$(shell ocamlc -version)
-
-PACKAGE=$(shell dpkg-parsechangelog | awk "/Source: .*/ { gsub(\"Source: \",\"\"); print }")
-
-# 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
-
-# PRIORITY should be set to 10 for stable compatibility package
-# and to 20 for unstable/testing package
-
-ifeq ($(PACKAGE),unison)
+# debian/rules for unison package
+# Copyright (C) 2006 Sylvain Le Gall <gildor at debian.org>
+#
+# 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, 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+
+# Generate debian/control using
+# fakeroot debian/rules debian/control DEB_AUTO_UPDATE_DEBIAN_CONTROL:=yes
+
+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))
+
+ifeq ($(DEB_SOURCE_PACKAGE),unison)
+# latest package
PACKAGE_VERSION=
PRIORITY=20
else
+# compatibility package
PACKAGE_VERSION=$(VERSION)
PRIORITY=10
endif
@@ -32,13 +70,6 @@
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
@@ -53,122 +84,178 @@
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
+##!/usr/bin/make -f
+#
+## In order to use dpatch
+#include /usr/share/dpatch/dpatch.make
+#
+#OCAMLABI=$(shell ocamlc -version)
+#
+#PACKAGE=$(shell dpkg-parsechangelog | awk "/Source: .*/ { gsub(\"Source: \",\"\"); print }")
+#
+## 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
+#
+## 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
Modified: trunk/packages/unison/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/watch?rev=3571&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/watch (original)
+++ trunk/packages/unison/trunk/debian/watch Thu Feb 15 23:03:50 2007
@@ -1,2 +1,2 @@
-version=2
+version=3
http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-([0-9\.]*)\.tar\.gz
More information about the Pkg-ocaml-maint-commits
mailing list