[Pkg-ocaml-maint-commits] r5484 - in /trunk/packages/unison/trunk/debian: README.Debian changelog control control.in patches/00list patches/01gtkfont.dpatch rules unison.doc-base.in

gildor at users.alioth.debian.org gildor at users.alioth.debian.org
Mon Apr 14 23:38:47 UTC 2008 

Author: gildor
Date: Mon Apr 14 23:38:47 2008
New Revision: 5484

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=5484
Log:
* Remove useless control.in and patches
* Change doc section
* Unset CFLAGS when compiling
* Update README to mention new alternate packages

Removed:
    trunk/packages/unison/trunk/debian/control.in
    trunk/packages/unison/trunk/debian/patches/01gtkfont.dpatch
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/patches/00list
    trunk/packages/unison/trunk/debian/rules
    trunk/packages/unison/trunk/debian/unison.doc-base.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=5484&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/README.Debian (original)
+++ trunk/packages/unison/trunk/debian/README.Debian Mon Apr 14 23:38:47 2008
@@ -27,8 +27,9 @@
 #----------------------------#
 
 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 )
+There now exist versions of the package : 
+- unison, unison-gtk (version 2.27)
+- unison2.13.16, unison2.13.16 (version 2.13.16)
 - unison2.9.1, unison2.9.1-gtk (version 2.9.1)
 
 The reason for this split is to preserve protocol compatibility with actual

Modified: trunk/packages/unison/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/changelog?rev=5484&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/changelog (original)
+++ trunk/packages/unison/trunk/debian/changelog Mon Apr 14 23:38:47 2008
@@ -1,12 +1,21 @@
-unison (2.13.16-10) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
+unison (2.27.57-1) UNRELEASED; urgency=low
+
+  [ Sylvain Le Gall]
+  * New upstream release (Closes: #462598):
+    * New option mountpoint can help avoid problem with removable media
+      (Closes: #349674)
+  * Unset CFLAGS in debian/rules (Closes: #476051)
+  * Upgrade to standards version 3.7.3 (no change)
+  * Update README.Debian to add new package unison2.13.16
+  * Remove debian/control.in
+  * Remove now useless gtkfont patch
+  * Change doc-base section to File Management
 
   [ Stefano Zacchiroli ]
   * promote Homepage to a real debian/control field, now that dpkg supports it
   * fix vcs-svn field to point just above the debian/ dir
 
- -- Stefano Zacchiroli <zack at debian.org>  Sat, 17 Nov 2007 17:32:54 +0100
+ -- Sylvain Le Gall <gildor at debian.org>  Mon, 14 Apr 2008 19:39:39 +0200
 
 unison (2.13.16-9) 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=5484&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/control (original)
+++ trunk/packages/unison/trunk/debian/control Mon Apr 14 23:38:47 2008
@@ -2,8 +2,8 @@
 Section: utils
 Priority: optional
 Maintainer: Sylvain Le Gall <gildor at debian.org>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), liblablgtk2-ocaml-dev (>= 2.6.0-13), chrpath, librsvg2-bin (>= 2.18.2-1), imagemagick
-Standards-Version: 3.7.2
+Build-Depends: cdbs (>= 0.4.23), debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0-8), liblablgtk2-ocaml-dev (>= 2.6.0-13), chrpath, librsvg2-bin (>= 2.18.2), imagemagick
+Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ocaml-maint/trunk/packages/unison/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/
 Homepage: http://www.cis.upenn.edu/~bcpierce/unison/
@@ -38,7 +38,7 @@
 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 with GTK interface
+Description: A file-synchronization tool for Unix and Windows with GTK+ interface
  Unison is a file-synchronization tool for Unix and Windows, written
  in OCaml. It allows two replicas of a collection of files and
  directories to be stored on different hosts (or different disks
@@ -58,4 +58,4 @@
  specification, and is resilient to failure due to its careful 
  handling of the replicas and its private structures.
  .
- This package adds the optional GTK interface.
+ This package adds the optional GTK+ interface.

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=5484&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/patches/00list (original)
+++ trunk/packages/unison/trunk/debian/patches/00list Mon Apr 14 23:38:47 2008
@@ -1,1 +1,0 @@
-01gtkfont

Modified: trunk/packages/unison/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/rules?rev=5484&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/rules (original)
+++ trunk/packages/unison/trunk/debian/rules Mon Apr 14 23:38:47 2008
@@ -16,9 +16,6 @@
 # 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
@@ -99,12 +96,12 @@
 	cp config/Makefile.unix config/Makefile
 
 build/$(UNISON_PACKAGE)::
-	$(MAKE) UISTYLE=text NATIVE=$(NATIVE) $(MY_MAKE_FLAGS)
+	$(MAKE) UISTYLE=text NATIVE=$(NATIVE) $(MY_MAKE_FLAGS) CFLAGS=
 	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)
+	$(MAKE) UISTYLE=$(UISTYLE) NATIVE=$(NATIVE) $(MY_MAKE_FLAGS) CFLAGS=
 	mv '$(CURDIR)/unison' '$(CURDIR)/$(UNISON_GTK)'
 	if test 'x$(OCAML_HAVE_OCAMLOPT)' = 'xyes'; then /usr/bin/chrpath -d '$(CURDIR)/$(UNISON_GTK)'; fi
 

Modified: trunk/packages/unison/trunk/debian/unison.doc-base.in
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/unison/trunk/debian/unison.doc-base.in?rev=5484&op=diff
==============================================================================
--- trunk/packages/unison/trunk/debian/unison.doc-base.in (original)
+++ trunk/packages/unison/trunk/debian/unison.doc-base.in Mon Apr 14 23:38:47 2008
@@ -7,7 +7,7 @@
  disks on the same host), modified separately, and then brought
  up to date by propagating the changes in each replica to the
  other. This manual describes how to install and use Unison.
-Section: Apps/Tools
+Section: File Management
 
 Format: text
 Files: /usr/share/doc/@UNISON_PACKAGE@/unison-manual.txt.gz

More information about the Pkg-ocaml-maint-commits mailing list