[Pkg-sks-commit] r44 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 14:40:46 +0000 (Thu, 19 Jun 2008)
New Revision: 44

Added:
   sks/trunk/sks/debian/patches/502_makefile_misc_fixes
Removed:
   sks/trunk/sks/debian/patches/502_common.ml_unfuck
Modified:
   sks/trunk/sks/debian/patches/501_makefile_cflags
   sks/trunk/sks/debian/rules
Log:
[project @ 45]
common.ml and patches cleanup

Original author: fabbione
Date: 2003-12-03 16:51:14.784483+00:00

Modified: sks/trunk/sks/debian/patches/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags	2008-06-19 14:40:36 UTC (rev 43)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags	2008-06-19 14:40:46 UTC (rev 44)
@@ -1,6 +1,6 @@
 diff -ruN sks-1.0.6-old/bdb/Makefile sks-1.0.6/bdb/Makefile
 --- sks-1.0.6-old/bdb/Makefile	2003-07-05 17:16:29.000000000 +0200
-+++ sks-1.0.6/bdb/Makefile	2003-12-01 19:08:32.000000000 +0100
++++ sks-1.0.6/bdb/Makefile	2003-12-03 17:38:25.000000000 +0100
 @@ -16,8 +16,8 @@
  CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
  CC=gcc
@@ -14,7 +14,7 @@
  RANLIB=ranlib
 diff -ruN sks-1.0.6-old/cryptokit-1.0/Makefile sks-1.0.6/cryptokit-1.0/Makefile
 --- sks-1.0.6-old/cryptokit-1.0/Makefile	2002-04-04 14:27:31.000000000 +0200
-+++ sks-1.0.6/cryptokit-1.0/Makefile	2003-12-01 19:08:32.000000000 +0100
++++ sks-1.0.6/cryptokit-1.0/Makefile	2003-12-03 17:38:25.000000000 +0100
 @@ -13,7 +13,7 @@
  INSTALLDIR=`$(OCAMLC) -where`
  
@@ -42,8 +42,8 @@
  test: test.byt
  	$(OCAMLRUN) -I . ./test.byt
 diff -ruN sks-1.0.6-old/Makefile sks-1.0.6/Makefile
---- sks-1.0.6-old/Makefile	2003-11-29 14:38:17.000000000 +0100
-+++ sks-1.0.6/Makefile	2003-12-01 19:12:57.000000000 +0100
+--- sks-1.0.6-old/Makefile	2003-11-29 13:46:30.000000000 +0100
++++ sks-1.0.6/Makefile	2003-12-03 17:39:05.000000000 +0100
 @@ -17,8 +17,8 @@
  CINCLUDES=-I`ocamlc -where`
  CC=gcc
@@ -68,21 +68,3 @@
  
  bdbclean:
  	cd bdb && $(MAKE) clean
-@@ -247,7 +247,7 @@
- CKDIR=cryptokit-1.0
- 
- $(CKDIR)/README: 
--	tar xmvfz $(CKDIR).tar.gz
-+	#tar xmvfz $(CKDIR).tar.gz
- 
- $(CKDIR)/cryptokit.cma: $(CKDIR)/README
- 	cd $(CKDIR) && $(MAKE) all
-@@ -273,7 +273,7 @@
- NXDIR=numerix-0.19
- 
- $(NXDIR)/READ.ME:
--	tar xvmfz $(NXDIR)-3.tar.gz
-+	#tar xvmfz $(NXDIR)-3.tar.gz
- 
- $(NXDIR)/config.status: $(NXDIR)/READ.ME
- 	cd $(NXDIR) && \

Deleted: sks/trunk/sks/debian/patches/502_common.ml_unfuck
===================================================================
--- sks/trunk/sks/debian/patches/502_common.ml_unfuck	2008-06-19 14:40:36 UTC (rev 43)
+++ sks/trunk/sks/debian/patches/502_common.ml_unfuck	2008-06-19 14:40:46 UTC (rev 44)
@@ -1,12 +0,0 @@
-diff -ruN sks-1.0.5-old/Makefile sks-1.0.5/Makefile
---- sks-1.0.5-old/Makefile	2003-12-03 01:11:38.000000000 +0100
-+++ sks-1.0.5/Makefile	2003-12-03 01:12:14.000000000 +0100
-@@ -117,7 +117,7 @@
- 	touch Makefile.local
- 
- common.ml: common.src.ml VERSION
--	sed s/__VERSION__/$(COMMA_VERSION)/ < common.src.ml > common.ml
-+	#sed s/__VERSION__/$(COMMA_VERSION)/ < common.src.ml > common.ml
- 
- src: 
- 	if [ ! -x $(VERSIONPREFIX) ]; then ln -s . $(VERSIONPREFIX); fi

Added: sks/trunk/sks/debian/patches/502_makefile_misc_fixes
===================================================================
--- sks/trunk/sks/debian/patches/502_makefile_misc_fixes	                        (rev 0)
+++ sks/trunk/sks/debian/patches/502_makefile_misc_fixes	2008-06-19 14:40:46 UTC (rev 44)
@@ -0,0 +1,40 @@
+diff -ruN sks-1.0.6-old/Makefile sks-1.0.6/Makefile
+--- sks-1.0.6-old/Makefile	2003-12-03 17:39:33.000000000 +0100
++++ sks-1.0.6/Makefile	2003-12-03 17:41:59.000000000 +0100
+@@ -247,7 +247,7 @@
+ CKDIR=cryptokit-1.0
+ 
+ $(CKDIR)/README: 
+-	tar xmvfz $(CKDIR).tar.gz
++	#tar xmvfz $(CKDIR).tar.gz
+ 
+ $(CKDIR)/cryptokit.cma: $(CKDIR)/README
+ 	cd $(CKDIR) && $(MAKE) all
+@@ -273,7 +273,7 @@
+ NXDIR=numerix-0.19
+ 
+ $(NXDIR)/READ.ME:
+-	tar xvmfz $(NXDIR)-3.tar.gz
++	#tar xvmfz $(NXDIR)-3.tar.gz
+ 
+ $(NXDIR)/config.status: $(NXDIR)/READ.ME
+ 	cd $(NXDIR) && \
+@@ -373,6 +373,7 @@
+ 
+ # Clean up
+ mlclean:
++	rm -f common.ml
+ 	rm -f *.cm[iox]
+ 	rm -f *.opt
+ 	rm -f *.bc
+@@ -384,8 +385,8 @@
+ 
+ cleanall: clean bdbclean
+ 	rm -f lib/*
+-	rm -rf $(CKDIR)
+-	rm -rf $(NXDIR)
++	#rm -rf $(CKDIR)
++	#rm -rf $(NXDIR)
+ 	rm -rf
+ 
+ # Dependencies

Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules	2008-06-19 14:40:36 UTC (rev 43)
+++ sks/trunk/sks/debian/rules	2008-06-19 14:40:46 UTC (rev 44)
@@ -18,7 +18,7 @@
 configure: configure-stamp
 configure-stamp: $(patched)
 	dh_testdir
-	cd $(BUILD_TREE) && make dep
+	cd $(BUILD_TREE) && make clean dep
 	touch configure-stamp
 
 build: configure-stamp build-stamp