[interchange-cvs] interchange - racke modified 10 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2007-08-06 20:05:24 GMT
Modified:  debian   changelog interchange-cat-standard.templates rules
Added:     debian   compat interchange-cat-standard.install
Added:              interchange-ui.install interchange.install
Removed:   debian   interchange-cat-standard.files interchange-ui.files
Removed:            interchange.files
Log:
switched from dh_movefiles to dh_install

Revision  Changes    Path
2.75      +2 -1      interchange/debian/changelog


rev 2.75, prev_rev 2.74
Index: changelog
===================================================================
RCS file: /var/cvs/interchange/debian/changelog,v
retrieving revision 2.74
retrieving revision 2.75
diff -u -r2.74 -r2.75
--- changelog	6 Jul 2007 10:12:41 -0000	2.74
+++ changelog	6 Aug 2007 20:05:24 -0000	2.75
@@ -4,8 +4,9 @@
   * removed db_stop call from interchange-ui's postrm script
     (Closes: #431580, thanks to Michael Ablassmeier <abi at grinser.de> for the
     report)
+  * switched from dh_movefiles to dh_install
   
- -- Stefan Hornburg (Racke) <racke at linuxia.de>  Fri,  6 Jul 2007 12:12:12 +0200
+ -- Stefan Hornburg (Racke) <racke at linuxia.de>  Mon,  6 Aug 2007 21:46:12 +0200
 
 interchange (5.4.2-4) unstable; urgency=low
 



2.6       +11 -0     interchange/debian/interchange-cat-standard.templates


rev 2.6, prev_rev 2.5
Index: interchange-cat-standard.templates
===================================================================
RCS file: /var/cvs/interchange/debian/interchange-cat-standard.templates,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -r2.5 -r2.6
--- interchange-cat-standard.templates	19 May 2006 20:44:17 -0000	2.5
+++ interchange-cat-standard.templates	6 Aug 2007 20:05:24 -0000	2.6
@@ -82,3 +82,14 @@
 Default: standard
 _Description: Database name
  Please select the name of the database.
+
+Template: interchange-cat-standard/dbuser
+Type: string
+Default: interchange
+_Description: Database user
+ Please specify the username for connecting to the database.
+
+Template: interchange-cat-standard/dbpass
+Type: password
+_Description: Database password
+ Please specify the password for connecting to the database.



2.36      +2 -5      interchange/debian/rules


rev 2.36, prev_rev 2.35
Index: rules
===================================================================
RCS file: /var/cvs/interchange/debian/rules,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -r2.35 -r2.36
--- rules	22 Jun 2007 12:13:10 -0000	2.35
+++ rules	6 Aug 2007 20:05:24 -0000	2.36
@@ -20,9 +20,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=2
-
 ifndef PERL
 	PERL = /usr/bin/perl
 endif
@@ -104,7 +101,6 @@
 # UI images and stuff
 	mkdir -p $(TMP)/var/www/interchange-5
 	for dir in $(TMP)/usr/lib/interchange/share/interchange-5/*; do mv $$dir $(TMP)/var/www/interchange-5; done
-	chmod -x -R $(TMP)/var/www/interchange-5
 	rm -r $(TMP)/usr/lib/interchange/share/interchange-5
 # remove unneeded stuff
 	rm $(TMP)/usr/lib/interchange/error.log
@@ -124,7 +120,6 @@
 # make VERSION file
 	echo 'Variable MAJOR_VERSION $(IC_MAJOR_VERSION)' > $(TMP)/usr/lib/interchange/VERSION
 	echo 'Variable VERSION $(IC_VERSION)' >> $(TMP)/usr/lib/interchange/VERSION
-	dh_movefiles
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -136,6 +131,7 @@
 # no init.d script
 # no cron scripts
 	dh_installchangelogs -i
+	dh_install -i --sourcedir=debian/tmp
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i
@@ -156,6 +152,7 @@
 # install cron script
 	dh_installcron -a
 	dh_installchangelogs -a
+	dh_install -a -p interchange --sourcedir=debian/tmp --exclude=UI --exclude=standard
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a



2.1                  interchange/debian/compat


rev 2.1, prev_rev 2.0



2.1                  interchange/debian/interchange-cat-standard.install


rev 2.1, prev_rev 2.0



2.1                  interchange/debian/interchange-ui.install


rev 2.1, prev_rev 2.0



2.1                  interchange/debian/interchange.install


rev 2.1, prev_rev 2.0