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

[Christoph Martin]

Author: chrism
Date: 2012-06-20 09:47:50 +0000 (Wed, 20 Jun 2012)
New Revision: 239

Modified:
   sks/trunk/sks/debian/changelog
   sks/trunk/sks/debian/patches/500_debian_fhs.patch
   sks/trunk/sks/debian/patches/501_makefile_cflags.patch
   sks/trunk/sks/debian/patches/series
   sks/trunk/sks/debian/rules
   sks/trunk/sks/debian/sks.dirs
   sks/trunk/sks/debian/sks.docs
Log:
* New upstream release (closes: #663757)
* change patches to work with new release
* include sample config and web
* include default index.html and robots.txt (closes: #600008)

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2012-06-20 09:04:11 UTC (rev 238)
+++ sks/trunk/sks/debian/changelog	2012-06-20 09:47:50 UTC (rev 239)
@@ -1,3 +1,12 @@
+sks (1.1.3-1) UNRELEASED; urgency=low
+
+  * New upstream release (closes: #663757)
+  * change patches to work with new release
+  * include sample config and web
+  * include default index.html and robots.txt (closes: #600008)
+
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Tue, 19 Jun 2012 17:59:09 +0200
+
 sks (1.1.1+dpkgv3-8) unstable; urgency=low
 
   * fix debian/watch

Modified: sks/trunk/sks/debian/patches/500_debian_fhs.patch
===================================================================
--- sks/trunk/sks/debian/patches/500_debian_fhs.patch	2012-06-20 09:04:11 UTC (rev 238)
+++ sks/trunk/sks/debian/patches/500_debian_fhs.patch	2012-06-20 09:47:50 UTC (rev 239)
@@ -1,15 +1,15 @@
 --- a/common.ml
 +++ b/common.ml
-@@ -82,7 +82,7 @@
+@@ -85,7 +85,7 @@
  
- let set_logfile extension = 
+ let set_logfile extension =
    if !Settings.filelog then
 -    let fname = (Filename.concat !Settings.basedir extension) ^ ".log" in
 +    let fname = (Filename.concat !Settings.basedir "/var/log/sks/") ^ extension ^ ".log" in
      stored_logfile_name := Some fname;
-     logfile := open_out_gen [ Open_wronly; Open_creat; Open_append; ] 
+     logfile := open_out_gen [ Open_wronly; Open_creat; Open_append; ]
        0o600 fname;
-@@ -208,8 +208,8 @@
+@@ -213,8 +213,8 @@
  let recon_address = !Settings.recon_address
  let http_port = !Settings.hkp_port
  let http_address = !Settings.hkp_address

Modified: sks/trunk/sks/debian/patches/501_makefile_cflags.patch
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags.patch	2012-06-20 09:04:11 UTC (rev 238)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags.patch	2012-06-20 09:47:50 UTC (rev 239)
@@ -30,7 +30,7 @@
  CAMLP4=-pp $(CAMLP4O)
 -CAMLINCLUDE= -I lib -I bdb
 +CAMLINCLUDE= -I lib -I bdb -I +cryptokit
- COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes -ccopt -pthread -warn-error A
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes -ccopt -pthread -ccopt -pg -warn-error A
  OCAMLDEP=ocamldep $(CAMLP4) 
  CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma
 @@ -99,7 +99,7 @@

Modified: sks/trunk/sks/debian/patches/series
===================================================================
--- sks/trunk/sks/debian/patches/series	2012-06-20 09:04:11 UTC (rev 238)
+++ sks/trunk/sks/debian/patches/series	2012-06-20 09:47:50 UTC (rev 239)
@@ -3,9 +3,9 @@
 500_debian_fhs.patch 
 501_makefile_cflags.patch 
 502_makefile_install.patch 
-508_build_fastbuild.patch 
-509-content-types.patch 
-510-allowed-chars.patch 
+#508_build_fastbuild.patch 
+#509-content-types.patch 
+#510-allowed-chars.patch 
 511_gcc44.patch 
-512_no_XA_berkeleydb.patch
-520_fix_non-compliant_POST.patch
+#512_no_XA_berkeleydb.patch
+#520_fix_non-compliant_POST.patch

Modified: sks/trunk/sks/debian/rules
===================================================================
--- sks/trunk/sks/debian/rules	2012-06-20 09:04:11 UTC (rev 238)
+++ sks/trunk/sks/debian/rules	2012-06-20 09:47:50 UTC (rev 239)
@@ -18,6 +18,7 @@
 	dh  $@ --with=ocaml
 
 override_dh_auto_build:
+	make dep
 	dh_auto_build -v --  $(all)
 
 override_dh_auto_install:
@@ -26,6 +27,7 @@
 #	Debian specific
 	cp -a debian/debcfg/* debian/sks/etc/sks
 	echo $(BDB_VERSION) > debian/sks/usr/lib/sks/berkeley_db.txt
+	cp -a sampleWeb/OpenPKG/* debian/sks/var/lib/sks/www/
 
 # Use override_dh_* targets to customize this.
 # ---------------------------------------------------

Modified: sks/trunk/sks/debian/sks.dirs
===================================================================
--- sks/trunk/sks/debian/sks.dirs	2012-06-20 09:04:11 UTC (rev 238)
+++ sks/trunk/sks/debian/sks.dirs	2012-06-20 09:47:50 UTC (rev 239)
@@ -2,6 +2,7 @@
 usr/sbin
 usr/lib/sks
 var/lib/sks/dump
+var/lib/sks/www
 var/log/sks
 var/spool/sks/messages
 var/spool/sks/failed_messages

Modified: sks/trunk/sks/debian/sks.docs
===================================================================
--- sks/trunk/sks/debian/sks.docs	2012-06-20 09:04:11 UTC (rev 238)
+++ sks/trunk/sks/debian/sks.docs	2012-06-20 09:47:50 UTC (rev 239)
@@ -1 +1,4 @@
 README
+CHANGELOG
+sampleConfig
+sampleWeb
\ No newline at end of file