[vhffs-dev] [1453] Correct use of architecture tag

[subversion@xxxxxxxxxxxxx]

Revision: 1453
Author:   beuss
Date:     2009-06-18 09:28:45 +0200 (Thu, 18 Jun 2009)

Log Message:
-----------
Correct use of architecture tag

Modified Paths:
--------------
    trunk/debian/changelog
    trunk/debian/control
    trunk/debian/rules

Added Paths:
-----------
    trunk/debian/vhffs-l10n.files


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-06-18 05:45:06 UTC (rev 1452)
+++ trunk/debian/changelog	2009-06-18 07:28:45 UTC (rev 1453)
@@ -1,4 +1,4 @@
-vhffs (4.2.0) unstable; urgency=low
+vhffs (4.2.0-1) unstable; urgency=low
 
   * Initial release
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-06-18 05:45:06 UTC (rev 1452)
+++ trunk/debian/control	2009-06-18 07:28:45 UTC (rev 1453)
@@ -20,7 +20,7 @@
  services (Exim, apache, etc.).
 
 Package: vhffs-api
-Architecture: any
+Architecture: all
 Depends: perl
 Description: VHFFS - API Part.
  This package is required for most VHFFS components
@@ -28,26 +28,26 @@
  for VHFFS.
 
 Package: vhffs-panel
-Architecture: any
+Architecture: all
 Depends: vhffs-panel-members, vhffs-panel-public
 Description: Meta package for vhffs panel (public & members part).
 
 Package: vhffs-panel-members
-Architecture: any
+Architecture: all
 Depends: vhffs-api,apache2,perl
 Description: VHFFS - Web panel for VHFFS. Members part
  Provides a web panel to request services creation,
  moderation and administration.
 
 Package: vhffs-panel-public
-Architecture: any
+Architecture: all
 Depends: vhffs-api,apache2,perl
 Description: VHFFS - Web panel for VHFFS. Public part.
  Provides a public web interface to consult hosted
  projects
 
 Package: vhffs-robots
-Architecture: any
+Architecture: all
 Depends: vhffs-api,perl
 Description: VHFFS - Services robots.
  This package contains robots needed by VHFFS for
@@ -72,14 +72,14 @@
  Some additional packages, patches, etc. for VHFFS.
 
 Package: vhffs-jabber
-Architecture: any
+Architecture: all
 Depends: jabber
 Description: VHFFS - Jabber connector
  Connector allowing jabber to use VHFFS database as
  authentication backend.
 
 Package: vhffs-listengine
-Architecture: any
+Architecture: all
 Depends: vhffs-api, vhffs-common
 Description: VHFFS - Listengine dispatcher
  Script bouncing mail to mailing list subscribers.
@@ -98,9 +98,14 @@
  svn+ssh:// virtual protocol, CVS and GIT.
 
 Package: vhffs-tools
-Architecture: any
-Depends: libncursesw5
+Architecture: all
+Depends: libncursesw5,libcurses-ui-perl
 Description: VHFFS - CLI tools
  Provides some command line tools to interact with
  VHFFS DB. Some of them, written after taking huge
  quantity of vodka even use ncurses!
+
+Package: vhffs-l10n
+Architecture: all
+Description: VHFFS - Localisation
+ Contains french, spanish and english translations.

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-06-18 05:45:06 UTC (rev 1452)
+++ trunk/debian/rules	2009-06-18 07:28:45 UTC (rev 1453)
@@ -57,8 +57,9 @@
 build-arch-stamp:  config.status 
 
 	# Add here commands to compile the arch part of the package.
-	#$(MAKE)
-	touch $@
+	$(MAKE) -C $(BASEDIR)/vhffs-autokill/ -C $(BASEDIR)/vhffs-fs/ \
+		-C $(BASEDIR)/vhffs-fssync/ -C $(BASEDIR)/vhffs-shells/ \
+		-C $(BASEDIR)/vhffs-stsmon DESTDIR=$(BASEDIR)/$(TMP)/
 
 build-indep: build-indep-stamp
 build-indep-stamp:  config.status 
@@ -86,9 +87,15 @@
 	dh_installdirs -i
 
 	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
-	$(MAKE) -C vhffs-backend/ install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
+	# debian/indep
+	$(MAKE) -C $(BASEDIR)/ vhffs-api/ -C $(BASEDIR)/ vhffs-backend/ \
+		-C $(BASEDIR)/ vhffs-doc/ -C $(BASEDIR)/ vhffs-forum/ \
+		-C $(BASEDIR)/ vhffs-intl/ -C $(BASEDIR)/ vhffs-irc/ \
+		-C $(BASEDIR)/ vhffs-jabber/ -C $(BASEDIR)/ vhffs-listengine/ \
+		-C $(BASEDIR)/ vhffs-mw/ -C $(BASEDIR)/ vhffs-panel/ \
+		-C $(BASEDIR)/ vhffs-public/ -C $(BASEDIR)/ vhffs-robots/ \
+		-C $(BASEDIR)/ vhffs-themes/ -C $(BASEDIR)/ vhffs-tools/ \
+		install DESTDIR=$(BASEDIR)/$(TMP_INDEP)/
 
 	dh_movefiles -i --sourcedir=$(TMP_INDEP)/
 
@@ -100,7 +107,11 @@
 
 	# Add here commands to install the arch part of the package into
 	# debian/tmp.
-	$(MAKE) install DESTDIR=$(BASEDIR)/$(TMP)/
+	$(MAKE) -C vhffs-autokill/ install DESTDIR=$(BASEDIR)/$(TMP)/
+	$(MAKE) -C vhffs-fs/ install DESTDIR=$(BASEDIR)/$(TMP)/
+	$(MAKE) -C vhffs-fssync/ install DESTDIR=$(BASEDIR)/$(TMP)/
+	$(MAKE) -C vhffs-shells/ install DESTDIR=$(BASEDIR)/$(TMP)/
+	$(MAKE) -C vhffs-stsmon/ install DESTDIR=$(BASEDIR)/$(TMP)/
 
 	dh_movefiles -a
 

Added: trunk/debian/vhffs-l10n.files
===================================================================
--- trunk/debian/vhffs-l10n.files	                        (rev 0)
+++ trunk/debian/vhffs-l10n.files	2009-06-18 07:28:45 UTC (rev 1453)
@@ -0,0 +1,4 @@
+/usr/share/locale/en_US/LC_MESSAGES/vhffs.mo
+/usr/share/locale/fr_FR/LC_MESSAGES/vhffs.mo
+/usr/share/locale/es_ES/LC_MESSAGES/vhffs.mo
+/usr/share/locale/de_DE/LC_MESSAGES/vhffs.mo