Added debian-dist and debian-upload targets. Also documented usage.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 7efae51..5237aae 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
 # Note:  Makefile is built automatically from Makefile.in
 #

-# $Id: GNUmakefile.in,v 1.104 2002/05/24 00:03:49 oes Exp $
+# $Id: GNUmakefile.in,v 1.105 2002/05/25 22:48:19 hal9 Exp $

 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/


@@ -457,9 +457,16 @@ hpux-upload:
 # debian distribution
 #############################################################################
 debian-dist:
 # debian distribution
 #############################################################################
 debian-dist:

-       @$(ECHO) coming soon. 
+       @$(ECHO) Creating Debian package.  Will exist in parent directory.
+       dpkg-buildpackage -rfakeroot -us -uc

 debian-upload:
 debian-upload:

-       @$(ECHO) coming soon. 
+       ncftpput -u anonymous -p ijbswa-developers@lists.sourceforge.net upload.sourceforge.net /incoming ../privoxy_$(shell dpkg-parsechangelog | grep "Version" | sed "s/Version: //")_$(shell dpkg --print-architecture).deb
+       @$(ECHO) -------------------------------------------------------
+       @$(ECHO) Now goto
+       @$(ECHO) http://sourceforge.net/project/admin/editpackages.php?group_id=11118
+       @$(ECHO) ... and release the files.
+       @$(ECHO) -------------------------------------------------------
+

 
 #############################################################################
 # macosx distribution
 
 #############################################################################
 # macosx distribution


@@ -839,6 +846,9 @@ coffee:
 ## end:
 
 # $Log: GNUmakefile.in,v $
 ## end:
 
 # $Log: GNUmakefile.in,v $

+# Revision 1.105  2002/05/25 22:48:19  hal9
+# Add -notoc to README build (per oes's dsl magic).
+#

 # Revision 1.104  2002/05/24 00:03:49  oes
 # Use p_doc.css for the Homepage for consistency
 #
 # Revision 1.104  2002/05/24 00:03:49  oes
 # Use p_doc.css for the Homepage for consistency
 #

diff --git a/doc/source/developer-manual.sgml b/doc/source/developer-manual.sgml
index 5049edd..01fe1da 100644 (file)
--- a/doc/source/developer-manual.sgml
+++ b/doc/source/developer-manual.sgml
@@ -8,8 +8,8 @@
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">
 <!entity contacting SYSTEM "contacting.sgml">
 <!entity copyright SYSTEM "copyright.sgml">
 <!entity license SYSTEM "license.sgml">

-<!entity p-version "2.9.15">
-<!entity p-status "beta">
+<!entity p-version "3.1.1">
+<!entity p-status "alpha">

 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->
 <!entity % p-not-stable "INCLUDE">
 <!entity % p-stable "IGNORE">
 <!entity % p-text "IGNORE">        <!-- define we are not a text only doc -->


@@ -23,7 +23,7 @@
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 
                 This file belongs into
                 ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/
                 

- $Id: developer-manual.sgml,v 1.45 2002/05/19 23:01:54 hal9 Exp $
+ $Id: developer-manual.sgml,v 1.46 2002/05/22 17:15:00 oes Exp $

 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.
 
  Copyright (C) 2001, 2002 Privoxy Developers <developers@privoxy.org>
  See LICENSE.


@@ -50,7 +50,7 @@
     </pubdate>
 
 
     </pubdate>
 
 

-    <pubdate>$Id: developer-manual.sgml,v 1.45 2002/05/19 23:01:54 hal9 Exp $</pubdate>
+    <pubdate>$Id: developer-manual.sgml,v 1.46 2002/05/22 17:15:00 oes Exp $</pubdate>

 
 <!--
 
 
 <!--
 


@@ -1727,7 +1727,7 @@ static void unload_re_filterfile( void *f ) { ... }</programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>
 
     <para><emphasis>Example for file comments:</emphasis></para>
 <programlisting>

-const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.45 2002/05/19 23:01:54 hal9 Exp $";
+const char FILENAME_rcs[] = "$Id: developer-manual.sgml,v 1.46 2002/05/22 17:15:00 oes Exp $";

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -1787,7 +1787,7 @@ const char FILENAME_h_rcs[] = FILENAME_H_VERSION;
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H
 <programlisting>
 #ifndef _FILENAME_H
 #define _FILENAME_H

-#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.45 2002/05/19 23:01:54 hal9 Exp $"
+#define FILENAME_H_VERSION "$Id: developer-manual.sgml,v 1.46 2002/05/22 17:15:00 oes Exp $"

 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$
 /*********************************************************************
  *
  * File        :  $S<!-- Break CVS Substitution -->ource$


@@ -2449,16 +2449,29 @@ at sourceforge. Three simple steps:
        First, <emphasis>make sure that you have freshly exported the right
         version into an empty directory</emphasis>. (See "Building and releasing
         packages" above). Then, run:
        First, <emphasis>make sure that you have freshly exported the right
         version into an empty directory</emphasis>. (See "Building and releasing
         packages" above). Then, run:

-       </para>
-       <para>
+      </para>
+      <para>

        <programlisting>
   cd current
   autoheader && autoconf && ./configure
 </programlisting>
        <programlisting>
   cd current
   autoheader && autoconf && ./configure
 </programlisting>

-       </para>
-       <para>
-       Then do FIXME.
-       </para>
+      </para>
+      <para>
+        Then, run:
+      </para>
+      <para>
+       <programlisting>
+  make debian-dist
+</programlisting>
+      </para>
+      <para>
+        To upload the package to Sourceforge, simply issue
+      </para>
+      <para>
+        <programlisting>
+  make debian-upload
+</programlisting>
+      </para>

     </sect3>
 
     <sect3 id="newrelease-macosx"><title>Mac OSX</title>
     </sect3>
 
     <sect3 id="newrelease-macosx"><title>Mac OSX</title>


@@ -2801,6 +2814,9 @@ zip -r privoxyosx_setup_x.y.z.zip Privoxy.pkg
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $
   Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   $Log: developer-manual.sgml,v $

+  Revision 1.46  2002/05/22 17:15:00  oes
+  Updated intro
+

   Revision 1.45  2002/05/19 23:01:54  hal9
   Add small section on general packaging guidelines (e.g. actions files must
   be writable).
   Revision 1.45  2002/05/19 23:01:54  hal9
   Add small section on general packaging guidelines (e.g. actions files must
   be writable).