[Gforge-commits] gforge/debian changelog, 1.366, 1.367 gforge-common.dirs, 1.4, 1.5 rules, 1.72, 1.73

[cbayle]

Update of /cvsroot/gforge/gforge/debian
In directory db.perdue.net:/tmp/cvs-serv8641/debian

Modified Files:
        changelog gforge-common.dirs rules 
Log Message:
Now use setup in debian package
be warned this is experimental


Index: changelog
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/changelog,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- changelog   2 Mar 2004 22:31:24 -0000       1.366
+++ changelog   4 Mar 2004 23:53:06 -0000       1.367
@@ -1,4 +1,12 @@
-gforge (3.2.1-0+5) experimental; urgency=low
+gforge (3.2.1-2+23) experimental; urgency=low
+
+  * [Christian] Now use setup script (wrapped in gforge-config)
+  * [Christian] Added dependencies in control file so all package of the same 
version are
+    installed when you apt-get install gforge
+
+ -- Christian Bayle <address@hidden>  Wed,  3 Mar 2004 10:08:06 +0100
+
+gforge (3.2.1-2+4) experimental; urgency=low
 
   * [Roland] New upstream release.  Debian packaging still experimental at
     this stage.

Index: gforge-common.dirs
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/gforge-common.dirs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gforge-common.dirs  21 Sep 2003 10:18:28 -0000      1.4
+++ gforge-common.dirs  4 Mar 2004 23:53:06 -0000       1.5
@@ -1,5 +1,7 @@
 etc/gforge
 etc/gforge/templates
+etc/gforge/local.d
+etc/gforge/httpd.d
 usr/bin
 usr/lib/gforge/bin
 usr/lib/gforge/lib

Index: rules
===================================================================
RCS file: /cvsroot/gforge/gforge/debian/rules,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- rules       1 Mar 2004 17:02:13 -0000       1.72
+++ rules       4 Mar 2004 23:53:06 -0000       1.73
@@ -61,13 +61,19 @@
        # (gforge is a meta-package and needs no files)
 
        # gforge-common
-       install -m 644 deb-specific/local.inc.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
-       install -m 644 deb-specific/local.pl.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
-       install -m 644 deb-specific/database.inc.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
-       install -m 644 deb-specific/httpd.conf.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
-       install -m 644 deb-specific/httpd.common.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
-       install -m 644 deb-specific/httpd.vhosts.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
-       install -m 644 deb-specific/httpd.secrets.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+#      install -m 644 deb-specific/local.inc.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+#      install -m 644 deb-specific/local.pl.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+#      install -m 644 deb-specific/database.inc.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+#      install -m 644 deb-specific/httpd.conf.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+#      install -m 644 deb-specific/httpd.common.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+#      install -m 644 deb-specific/httpd.vhosts.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+#      install -m 644 deb-specific/httpd.secrets.template 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+       install -m 644 etc/httpd.d/[0-9][0-9]* 
$(CURDIR)/debian/gforge-common/etc/gforge/httpd.d/
+       install -m 644 etc/httpd.d/httpd* 
$(CURDIR)/debian/gforge-common/etc/gforge/httpd.d/
+       install -m 644 etc/local.d/[0-9][0-9]* 
$(CURDIR)/debian/gforge-common/etc/gforge/local.d/
+       install -m 644 etc/templates/*\.* 
$(CURDIR)/debian/gforge-common/etc/gforge/templates/
+       install -m 755 setup $(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
+       #
        install -m 755 deb-specific/install-chroot.sh 
$(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
        install -m 755 deb-specific/install-ssh.sh 
$(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
        install -m 755 utils/fill-in-the-blanks.pl 
$(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/
@@ -166,8 +172,8 @@
        install -m 755 deb-specific/install-cvs.sh 
$(CURDIR)/debian/gforge-cvs/usr/lib/gforge/bin/
        install -m 755 deb-specific/cvs-pserver 
$(CURDIR)/debian/gforge-cvs/usr/lib/gforge/bin/
        install -m 755 deb-specific/cvssh.pl 
$(CURDIR)/debian/gforge-cvs/bin/cvssh 
-       install -m 755 utils/cvsweb 
$(CURDIR)/debian/gforge-cvs/usr/lib/gforge/cgi-bin/cvsweb.cgi
-       install -m 755 utils/cvsweb 
$(CURDIR)/debian/gforge-cvs/usr/lib/gforge/bin/cvsweb
+       install -m 755 cgi-bin/cvsweb.cgi 
$(CURDIR)/debian/gforge-cvs/usr/lib/gforge/cgi-bin/cvsweb.cgi
+       install -m 755 cgi-bin/cvsweb.cgi 
$(CURDIR)/debian/gforge-cvs/usr/lib/gforge/bin/cvsweb
        install -m 644 etc/cvsweb.conf $(CURDIR)/debian/gforge-cvs/etc/gforge/
        install -m 755 deb-specific/tarballs.sh 
$(CURDIR)/debian/gforge-cvs/usr/lib/gforge/bin/
        install -m 755 deb-specific/cvs_dump_update.pl 
$(CURDIR)/debian/gforge-common/usr/lib/gforge/bin/