[Pkg-ocaml-maint-commits] r1315 - trunk/packages/unison/trunk/debian

Sylvain LE GALL gildor-guest@costa.debian.org
Mon, 25 Apr 2005 22:20:54 +0000


Author: gildor-guest
Date: 2005-04-25 22:20:53 +0000 (Mon, 25 Apr 2005)
New Revision: 1315

Modified:
   trunk/packages/unison/trunk/debian/rules
   trunk/packages/unison/trunk/debian/unison-gtk.menu.in
   trunk/packages/unison/trunk/debian/unison.doc-base.in
   trunk/packages/unison/trunk/debian/unison.docs.in
Log:
Rename package unison2.10.2 to unison -- SLG


Modified: trunk/packages/unison/trunk/debian/rules
===================================================================
--- trunk/packages/unison/trunk/debian/rules	2005-04-25 21:27:58 UTC (rev 1314)
+++ trunk/packages/unison/trunk/debian/rules	2005-04-25 22:20:53 UTC (rev 1315)
@@ -34,9 +34,17 @@
 	# rename all the debhelper files needed and substitue the @VERSION@
 	# string
 	for i in $(RENAME); do \
-	  sed -e "s/@VERSION@/$(VERSION)/g" $$i | sed -e "s/@PRIORITY@/$(PRIORITY)/g" > \
-	  $${$${i/unison/unison$(PACKAGE_VERSION)}%%.in}; \
+	  DST=$$i; \
+	  DST=$${DST/unison/unison$(PACKAGE_VERSION)}; \
+	  DST=$${DST%%.in}; \
+	  sed -e "s/@VERSION@/$(VERSION)/g" $$i | \
+	  sed -e "s/@PRIORITY@/$(PRIORITY)/g" | \
+	  sed -e "s/@PACKAGE_VERSION@/$(PACKAGE_VERSION)/g" > \
+	  $$DST; \
 	done
+	
+	# We always need to rename the manual 
+	mv debian/unison$(PACKAGE_VERSION).1 debian/unison$(VERSION).1
 
 	$(MAKE) UISTYLE=gtk2 NATIVE=$(NATIVE) NAME=unison$(VERSION)-gtk
 	
@@ -56,8 +64,12 @@
 	-$(RM) build-stamp configure-stamp
 	# remove the renamed files
 	-for i in $(RENAME); do \
-	  $(RM) $${$${i/unison/unison$(PACKAGE_VERSION)}%%.in}; \
+	  DST=$$i; \
+	  DST=$${DST/unison/unison$(PACKAGE_VERSION)}; \
+	  DST=$${DST%%.in}; \
+	  $(RM) $$DST; \
 	done
+	-$(RM) debian/unison$(VERSION).1
 	-$(RM) unison$(VERSION)-manual.txt unison$(VERSION)-gtk unison$(VERSION)
 	-$(MAKE) clean
 	dh_clean
@@ -71,8 +83,8 @@
 	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)/usr/bin
 	install -o root -g root -m 755 unison$(VERSION)-gtk \
 	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/bin
-	ln -s unison$(VERSION) \
-	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/share/doc/unison$(VERSION)-gtk
+	ln -s unison$(PACKAGE_VERSION) \
+	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/share/doc/unison$(PACKAGE_VERSION)-gtk
 	ln -s unison$(VERSION).1.gz \
 	  $(CURDIR)/debian/unison$(PACKAGE_VERSION)-gtk/usr/share/man/man1/unison$(VERSION)-gtk.1.gz
 
@@ -81,7 +93,9 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installdocs
+	dh_installdocs 
+	# Delete the doc-base.in install because of using dh_installdocs
+	$(RM) $(CURDIR)/debian/unison$(PACKAGE_VERSION)/usr/share/doc-base/unison@VERSION@-manual
 	dh_installmenu
 	dh_installman debian/unison$(VERSION).1
 	dh_installchangelogs NEWS

Modified: trunk/packages/unison/trunk/debian/unison-gtk.menu.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison-gtk.menu.in	2005-04-25 21:27:58 UTC (rev 1314)
+++ trunk/packages/unison/trunk/debian/unison-gtk.menu.in	2005-04-25 22:20:53 UTC (rev 1315)
@@ -1,3 +1,3 @@
-?package(unison@VERSION@-gtk):needs="x11" section="Apps/Net" \
+?package(unison@PACKAGE_VERSION@-gtk):needs="x11" section="Apps/Net" \
  title="Unison @VERSION@ (GTK)" command="/usr/bin/unison@VERSION@-gtk" \
  longtitle="Unison @VERSION@ file synchronizer (GTK interface)"

Modified: trunk/packages/unison/trunk/debian/unison.doc-base.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.doc-base.in	2005-04-25 21:27:58 UTC (rev 1314)
+++ trunk/packages/unison/trunk/debian/unison.doc-base.in	2005-04-25 22:20:53 UTC (rev 1315)
@@ -10,4 +10,4 @@
 Section: Apps/Tools
 
 Format: text
-Files: /usr/share/doc/unison@VERSION@/unison-manual.txt.gz
+Files: /usr/share/doc/unison@PACKAGE_VERSION@/unison-manual.txt.gz

Modified: trunk/packages/unison/trunk/debian/unison.docs.in
===================================================================
--- trunk/packages/unison/trunk/debian/unison.docs.in	2005-04-25 21:27:58 UTC (rev 1314)
+++ trunk/packages/unison/trunk/debian/unison.docs.in	2005-04-25 22:20:53 UTC (rev 1315)
@@ -1,3 +1,4 @@
 BUGS.txt
 TODO.txt
 unison-manual.txt
+debian/NEWS.Debian