[Pkg-ocaml-maint-commits] r1580 - in trunk/packages/demexp/trunk: . debian debian/patches

[Thomas Petazzoni]

Author: tpetazzo-guest
Date: 2005-08-05 23:29:39 +0000 (Fri, 05 Aug 2005)
New Revision: 1580

Removed:
   trunk/packages/demexp/trunk/debian/patches/configure.dpatch
Modified:
   trunk/packages/demexp/trunk/debian/changelog
   trunk/packages/demexp/trunk/debian/patches/00list
   trunk/packages/demexp/trunk/debian/patches/makefile.dpatch
   trunk/packages/demexp/trunk/debian/rules
   trunk/packages/demexp/trunk/demexp_0.6.orig.tar.gz
Log:
Switch to upstream version 0.6. Remove binaries rpath. Bump up Debian version to 0.6-2. Remove useless configure.dpatch, integrated upstream.

Modified: trunk/packages/demexp/trunk/debian/changelog
===================================================================
--- trunk/packages/demexp/trunk/debian/changelog	2005-08-04 15:31:04 UTC (rev 1579)
+++ trunk/packages/demexp/trunk/debian/changelog	2005-08-05 23:29:39 UTC (rev 1580)
@@ -1,3 +1,9 @@
+demexp (0.6-2) unstable; urgency=low
+
+  * Update to upstream version 0.6.
+
+ -- Thomas Petazzoni <thomas.petazzoni at enix.org>  Sat,  6 Aug 2005 01:25:25 +0200
+
 demexp (0.6-1) unstable; urgency=low
 
   * Initial Release (upstream version 0.5.5)

Modified: trunk/packages/demexp/trunk/debian/patches/00list
===================================================================
--- trunk/packages/demexp/trunk/debian/patches/00list	2005-08-04 15:31:04 UTC (rev 1579)
+++ trunk/packages/demexp/trunk/debian/patches/00list	2005-08-05 23:29:39 UTC (rev 1580)
@@ -1,2 +1 @@
-configure
 makefile

Deleted: trunk/packages/demexp/trunk/debian/patches/configure.dpatch
===================================================================
--- trunk/packages/demexp/trunk/debian/patches/configure.dpatch	2005-08-04 15:31:04 UTC (rev 1579)
+++ trunk/packages/demexp/trunk/debian/patches/configure.dpatch	2005-08-05 23:29:39 UTC (rev 1580)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## configure.dpatch by  <thomas at crazy.kos.nx>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad demexp-0.6/configure /tmp/dpep.3H46lg/demexp-0.6/configure
---- demexp-0.6/configure	2005-07-11 21:57:53.000000000 +0200
-+++ /tmp/dpep.3H46lg/demexp-0.6/configure	2005-07-29 22:42:08.000000000 +0200
-@@ -245,6 +245,8 @@
- echo "EXTERNAL_INC=$external_include" >> Makefile
- 
- external_cmxa=`ocamlfind query -predicates native -a-format -recursive -separator ' ' $external_package`
-+# remove spurious '+'
-+external_cmxa=`echo $external_cmxa | sed -e "s|+||g"`
- echo "EXTERNAL_CMXA=$external_cmxa" >> Makefile
- 
- # compute default targets and finish Makefile

Modified: trunk/packages/demexp/trunk/debian/patches/makefile.dpatch
===================================================================
--- trunk/packages/demexp/trunk/debian/patches/makefile.dpatch	2005-08-04 15:31:04 UTC (rev 1579)
+++ trunk/packages/demexp/trunk/debian/patches/makefile.dpatch	2005-08-05 23:29:39 UTC (rev 1580)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad demexp-0.6/config/Makefile.inc /tmp/dpep.e6y6zh/demexp-0.6/config/Makefile.inc
---- demexp-0.6/config/Makefile.inc	2005-07-11 21:57:53.000000000 +0200
-+++ /tmp/dpep.e6y6zh/demexp-0.6/config/Makefile.inc	2005-07-30 13:31:38.000000000 +0200
+diff -urNad --exclude=CVS --exclude=.svn ./config/Makefile.inc /tmp/dpep-work.yvEorz/demexp-0.6/config/Makefile.inc
+--- ./config/Makefile.inc	2005-08-05 22:20:40.000000000 +0200
++++ /tmp/dpep-work.yvEorz/demexp-0.6/config/Makefile.inc	2005-08-06 01:20:27.000000000 +0200
 @@ -63,7 +63,7 @@
  
  
@@ -17,15 +17,18 @@
  OCAMLDEP:=ocamldep
  OCAMLLEX:=ocamllex
  OCAMLYACC:=ocamlyacc
-@@ -418,10 +418,10 @@
+@@ -418,12 +418,11 @@
  	$(CDUCE) $(SRV_OCAMLINC) --compile $<
  
  %.cmo: %.cdo
--	$(OCAMLC) -c $(SRV_OCAMLINC) -pp "cdo2ml -static" -impl $<
-+	cd $(<D) ; $(OCAMLC) -c -package "cduce" -pp "$(CDUCE) --mlstub" -impl $(<F)
+-	cd $(<D) ; $(OCAMLC) -c $(SRV_OCAMLINC) -pp "$(CDUCE) --mlstub" \
+-		-impl $(<F)
++	cd $(<D) ; $(OCAMLOPT) -c -package "cduce" -pp "$(CDUCE) --mlstub" -impl $(<F)
++
  
  %.cmx: %.cdo
--	$(OCAMLOPT) -c $(SRV_OCAMLINC) -pp "cdo2ml -static" -impl $<
+-	cd $(<D) ; $(OCAMLOPT) -c $(SRV_OCAMLINC) -pp "$(CDUCE) --mlstub" \
+-		-impl $(<F)
 +	cd $(<D) ; $(OCAMLOPT) -c -package "cduce" -pp "$(CDUCE) --mlstub" -impl $(<F)
  
  ### O'Caml sources dependencies

Modified: trunk/packages/demexp/trunk/debian/rules
===================================================================
--- trunk/packages/demexp/trunk/debian/rules	2005-08-04 15:31:04 UTC (rev 1579)
+++ trunk/packages/demexp/trunk/debian/rules	2005-08-05 23:29:39 UTC (rev 1580)
@@ -48,9 +48,17 @@
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
+
+	# Remove wrong RPATH
+	chrpath -d gtk2-clnt/demexp-gtk2-client
+	chrpath -d srv/demexp-server
+
+        # Properly rename stuff
 	mv gtk2-clnt/demexp-gtk2-client gtk2-clnt/demexp-client-gtk2
 	mv doc/demexp-gtk2-client.1 doc/demexp-client-gtk2.1
 	cp misc/demexp.xpm debian/demexp-client-gtk2/usr/share/pixmaps/
+
+        # Let's go
 	dh_install
 
 # Build architecture-independent files here.

Modified: trunk/packages/demexp/trunk/demexp_0.6.orig.tar.gz
===================================================================
(Binary files differ)