Merge lp:~ehbello/gcs/trunk into lp:gcs

[Enrique Hernández Bello]

This branch releases a new personal version of GCS for karmic. It fixes some bugs, implements some items described in TODO file and also, another issues needed by Bardinux distribution.

Please, check if my changes are in line with your development policy.

[lp:~ehbello/gcs/trunk]

40. By Enrique Hernández Bello on 2010-05-10

Allows reading package lists with brackets in their versions, e.g.:
gcs (> 0.3.20)

41. By Enrique Hernández Bello on 2010-05-10

Fixed bug when divert a file due to a variable not defined.

42. By Enrique Hernández Bello on 2010-05-21

Updated changelog to show the last change

43. By Enrique Hernández Bello on 2010-07-05

Renamed function __parse_deps to __parse_list.

44. By Enrique Hernández Bello on 2010-07-05

Tiny refactorization in file.py

45. By Enrique Hernández Bello on 2010-07-05

Added support for debian install file to get a more readable rules file
in target packages.

46. By Enrique Hernández Bello on 2010-07-06

Added preliminary support for adding questions during install proccess
of the packages using DebConf.

47. By Enrique Hernández Bello on 2010-07-16

Bugfix: GCS didn't work if questions directory doesn't exists.

48. By Enrique Hernández Bello on 2010-07-16

Avoiding to create template file when there are no questions.

49. By Enrique Hernández Bello on 2010-07-16

Removed duped ${misc:Depends} in GCS template for debian control file.

50. By Enrique Hernández Bello on 2010-07-16

Fixed lintian warning 'maintainer-script-without-set-e' in GCS templates

51. By Enrique Hernández Bello on 2010-07-16

Supplied GCS template for setting the source format and fix the lintian
warning 'missing-debian-source-format'.

52. By Enrique Hernández Bello on 2010-07-16

Fixed lintian warning 'out-of-date-standards-version' in GCS templates

53. By Enrique Hernández Bello on 2010-07-16

Updated standards version and defined source format of package.

54. By Enrique Hernández Bello on 2010-07-16

Added initial manpages for gcs commands.

55. By Enrique Hernández Bello on 2010-07-18

Fixed a syntax bug making directories ;)

56. By Enrique Hernández Bello on 2010-07-18

Simplified the debian 'rules' file. Now installs manpages and uses a more
readable 'install' file instead dh_install sentences.

57. By Enrique Hernández Bello on 2010-07-22

_Really_ fixed lintian warning 'maintainer-script-without-set-e' in GCS
templates. Explanation:

http://us.generation-nt.com/answer/why-maintainer-bother-use-set-e-inste
ad-bin-sh-e-maintainer-scripts-help-194963531.html

58. By Enrique Hernández Bello on 2010-07-22

Fixed mode creating dirs on writing files. 0755 is more suitable than
750 ;)

59. By Enrique Hernández Bello on 2010-07-22

Enabled SourceFormatGenerator hook previously coded.

60. By Enrique Hernández Bello on 2010-07-22

Avoiding to include debconf code in installation scripts when there are
no defined questions.

61. By Enrique Hernández Bello on 2010-07-22

Simplified the debian 'rules' file also on GCS templates. Now installs
manpages and uses a more readable 'install' file instead dh_install
sentences.

62. By Enrique Hernández Bello on 2010-09-01

Releasing gcs 0.3.20+ehbello2 for lucid.

63. By Enrique Hernández Bello on 2010-09-07

Added a pseudo syntax check for package lists used in Debian control files.
Now supports packages with version and multiple dependences.

64. By Enrique Hernández Bello on 2010-09-25

Added support to create softlinks files using dh_link instead of copying
them.

65. By Enrique Hernández Bello on 2010-09-25

Fixed the first template question of example skel removing non valid
tabulators.

[Roberto C. Morano (rcmorano)]

Everything is fine, many thanks for the code :]

review: Approve

=== modified file 'TODO'
--- TODO	2009-03-12 21:03:28 +0000
+++ TODO	2010-09-25 22:48:44 +0000
@@ -1,5 +1,3 @@
- * Add <AUTHOR> token to the copyright template
- * Removed execution permission to the templates and give them to the post and pre scripts
  * Added the Architecture field to the info file
  * Checking the best way to put the versions
  * See how get the changelog from the svn log instead of from the info (which usually doesn't change

=== modified file 'builder.py'
--- builder.py	2008-03-25 17:29:55 +0000
+++ builder.py	2010-09-25 22:48:44 +0000
@@ -5,7 +5,7 @@
 import os.path
 import shutil
 
-import syck
+import yaml
 
 from config import config
 from generators.file import ControlGenerator
@@ -17,6 +17,9 @@
 from generators.file import PreRmGenerator
 from generators.file import PostRmGenerator
 from generators.file import CompatGenerator
+from generators.file import SourceFormatGenerator
+from generators.file import ConfigGenerator
+from generators.file import TemplatesGenerator
 from generators.file import CopyrightGenerator
 
 
@@ -26,7 +29,7 @@
 
     def __init__(self, path):
         config['source_path'] = path
-        config['info'] = syck.load(open(path + '/gcs/info').read())
+        config['info'] = yaml.load(open(path + '/gcs/info').read())
         extension = config['info'].get('config_extension', None)
         if extension:
             config['config_extension'] = extension
@@ -37,7 +40,7 @@
         """
         try:
             os.mkdir(config['source_path'] + '/debian')
-        except:
+        except OSError:
             pass
 
         self.__prepare_conffiles()
@@ -51,17 +54,29 @@
         PreRmGenerator().activate()
         PostRmGenerator().activate()
         CompatGenerator().activate()
+        SourceFormatGenerator().activate()
+        ConfigGenerator().activate()
+        TemplatesGenerator().activate()
         CopyrightGenerator().activate()
 
-        os.system('debuild -us -uc')
-
-        self.__delete_tmpfiles()
-
-
+        # FIXME: At the moment we need to keep the configuration files because
+        # the conversion doesn't transparently (dh_install rename problem)
+        #self.__delete_tmpfiles()
+
+
+
+
+    def build_package(self):
+        """ Build the package. Use a simply debuild for this propouse.
+        """
+        try:
+            os.system('debuild -us -uc')
+        except:
+            pass
 
 
     def __prepare_conffiles(self):
-        """ Add .gv4 extension at all conffiles (making a copy)
+        """ Add .gcs extension at all conffiles (making a copy)
         """
         def copy_file(arg, dirname, file_names):
 
@@ -79,7 +94,7 @@
 
 
     def __delete_tmpfiles(self):
-        """ Add .gv4 extension at all conffiles (making a copy)
+        """ Add .gcs extension at all conffiles (making a copy)
         """
         def delete_file(arg, dirname, file_names):
 

=== modified file 'config.py'
--- config.py	2008-03-25 17:29:55 +0000
+++ config.py	2010-09-25 22:48:44 +0000
@@ -3,18 +3,41 @@
 """ Parse /etc/gcs.conf for configuration options
 """
 
+import re
+import os
 import sys
-
-import syck
+import yaml
 
 try:
-    config = syck.load(open('/etc/gcs.conf').read())
-
-    # Add default options
-    config['source_path'] = './'
-    config['info'] = {}
-    
+    config = yaml.load(open('/etc/gcs.conf').read())
 except:
     print "Can't read /etc/gcs.conf file."
     sys.exit(1)
 
+# Add default options
+config['source_path'] = './'
+config['info'] = {}
+config['questions'] = []
+if not config.has_key('diverts_basepath'):
+    config['diverts_basepath'] = '/'
+
+questions_path = config['source_path'] + '/gcs/questions'
+
+if os.path.isdir(questions_path):
+    for template_file in os.listdir(questions_path):
+        template_path = config['source_path'] + 'gcs/questions/' + template_file
+
+        if os.path.isdir(template_path):
+            pass
+        
+        try:
+            template = re.sub(r'\n\n', '\n---\n', open(template_path).read())
+            template = re.sub(r'(?=\W+):(?=.+\n )', ': |\n', template)
+            for question in yaml.load_all(template):
+                config['questions'].append(question)
+        except yaml.scanner.ScannerError as e:
+            print "Error parsing %s file." % template_path
+            print e
+        except Exception as e:
+            print e
+            sys.exit(1)

=== modified file 'debian/changelog'
--- debian/changelog	2009-06-17 09:08:22 +0000
+++ debian/changelog	2010-09-25 22:48:44 +0000
@@ -1,3 +1,57 @@
+gcs (0.3.20+ehbello3) UNRELEASED; urgency=low
+
+  * Added a pseudo syntax check for package lists used in Debian control files.
+    Now supports packages with version and multiple dependences.
+  * Added support to create softlinks files using dh_link instead of copying
+    them.
+  * Fixed the first template question of example skel removing non valid
+    tabulators.
+
+ -- Enrique Hernández Bello <[e-mail]>  Sat, 25 Sep 2010 23:42:53 +0100
+
+gcs (0.3.20+ehbello2) lucid; urgency=low
+
+  * Allows reading package lists with brackets in their versions, e.g.:
+    gcs (> 0.3.20)
+  * Fixed bug when divert a file due to a variable not defined.
+  * Added support for debian install file to get a more readable rules file
+    in target packages.
+  * Added preliminary support for adding questions during install proccess
+    of the packages using DebConf.
+  * Fixed some lintian warnings in GCS templates:
+      - maintainer-script-without-set-e
+      - missing-debian-source-format
+      - out-of-date-standards-version
+  * Added initial manpages for gcs commands.
+
+ -- Enrique Hernández Bello <[e-mail]>  Fri, 16 Jul 2010 16:56:34 +0100
+
+gcs (0.3.20+ehbello1) karmic; urgency=low
+
+  * Added support for all architectures.
+  * Added preremoval script to delete all remaining pyc files for a clean
+    uninstall.
+  * Added support for Recommends and Suggests control fields.
+    preparation process is no longer necessary.
+  * Changed default config_extension to .gcs
+  * Added an option parameter for gcs_build to don't build the Debian source
+    generated. It's useful to build it later.
+  * Created <DISTRIB> tag with the codename of the parent distribution for the
+    changelog template.
+  * Added support for <AUTHOR> tag in copyright template.
+  * Deleted some old stuff.
+  * Replaced python-syck dependence by a newer python-yaml.
+  * The example section in the info file of the skeleton by default couldn't
+    have multiple words.
+  * Fixed almost all lintian warnings coming from this debian package and the
+    debian templates for gcs.
+  * Added feature to change the base directory of diverted files. Useful for a
+    run-parts style of directory. [config: diverts_basepath]
+  * Removed execution permission to the templates and gave them later to the
+    post and pre scripts
+
+ -- Enrique Hernández Bello <[e-mail]>  Sat, 20 Feb 2010 14:25:20 +0000
+
 gcs (0.3.20) jaunty; urgency=low
 
   * Added Provides: control's field support

=== modified file 'debian/control'
--- debian/control	2009-03-12 21:28:24 +0000
+++ debian/control	2010-09-25 22:48:44 +0000
@@ -4,14 +4,14 @@
 Maintainer: Junta de Andalucia <[e-mail]>
 Uploaders: Juanje Ojeda Croissier <[e-mail]>
 Build-Depends: debhelper (>= 7.0)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 Homepage: http://launchpad.net/gcs
 Vcs-Browser: http://codebrowse.launchpad.net/~guadalinex-members/gcs/trunk/changes
 Vcs-Bzr: http://bazaar.launchpad.net/~guadalinex-members/gcs/trunk
 
 Package: gcs
-Architecture: i386
-Depends: python, python-syck, python-support, debhelper, devscripts, make, fakeroot, gcc
+Architecture: all
+Depends: ${misc:Depends}, python, python-yaml, python-support, debhelper, devscripts, make, fakeroot, gcc
 Description: Guadalinex Configuration System
  gcs (Guadalinex Configuration System) is a system which was originally created
  to generate plane metapackages (just dependences) and configuration 

=== added file 'debian/gcs_build.1'
--- debian/gcs_build.1	1970-01-01 00:00:00 +0000
+++ debian/gcs_build.1	2010-09-25 22:48:44 +0000
@@ -0,0 +1,23 @@
+.TH gcs_build 1 "July 16, 2010" "Guadalinex Configuration System"
+.SH NAME
+gcs_build \- build a Debian package
+.SH SYNOPSIS
+.B gcs_build
+.RI [ -S ]
+.SH DESCRIPTION
+.PP
+Build a package from a customized skeleton spawned by gcs_skel
+.SH OPTIONS
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-S, \-\-sources
+debian source only, don't build binary files
+.SH SEE ALSO
+.BR gcs_skel (1).
+.br
+.SH AUTHOR
+Junta de Andalucia <[e-mail]>
+.PP
+This manual page was written by Enrique Hernández Bello <[e-mail]>,
+for the Debian project and may be used by others.

=== added file 'debian/gcs_skel.1'
--- debian/gcs_skel.1	1970-01-01 00:00:00 +0000
+++ debian/gcs_skel.1	2010-09-25 22:48:44 +0000
@@ -0,0 +1,16 @@
+.TH gcs_skel 1 "July 16, 2010" "Guadalinex Configuration System"
+.SH NAME
+gcs_skel \- generate a GCS skeleton
+.SH SYNOPSIS
+.B gcs_skel
+.SH DESCRIPTION
+.PP
+Generate a skeleton of directories to configure and build with gcs_build
+.SH SEE ALSO
+.BR gcs_build (1).
+.br
+.SH AUTHOR
+Junta de Andalucia <[e-mail]>
+.PP
+This manual page was written by Enrique Hernández Bello <[e-mail]>,
+for the Debian project and may be used by others.

=== added file 'debian/install'
--- debian/install	1970-01-01 00:00:00 +0000
+++ debian/install	2010-09-25 22:48:44 +0000
@@ -0,0 +1,9 @@
+builder.py /usr/share/gcs
+config.py /usr/share/gcs
+generators /usr/share/gcs
+skel /usr/share/gcs
+templates /usr/share/gcs
+doc /usr/share/gcs
+	gcs_build /usr/bin
+	gcs_skel /usr/bin
+	gcs.conf /etc

=== added file 'debian/manpages'
--- debian/manpages	1970-01-01 00:00:00 +0000
+++ debian/manpages	2010-09-25 22:48:44 +0000
@@ -0,0 +1,2 @@
+debian/gcs_build.1
+debian/gcs_skel.1

=== added file 'debian/prerm'
--- debian/prerm	1970-01-01 00:00:00 +0000
+++ debian/prerm	2010-09-25 22:48:44 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#DEBHELPER#
+
+set -e
+
+find /usr/share/gcs/ -iname "*.pyc" -delete

=== modified file 'debian/rules'
--- debian/rules	2008-03-25 17:29:55 +0000
+++ debian/rules	2010-09-25 22:48:44 +0000
@@ -1,48 +1,13 @@
 #!/usr/bin/make -f
-
-build:
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	dh_install  "builder.py" "/usr/share/gcs"
-	dh_install  "config.py" "/usr/share/gcs"
-	dh_install  "generators" "/usr/share/gcs"
-	dh_install  "skel" "/usr/share/gcs"
-	dh_install  "templates" "/usr/share/gcs"
-	dh_install  "doc" "/usr/share/gcs"
-	dh_install  "gcs_build" "/usr/bin"
-	dh_install  "gcs_skel" "/usr/bin"
-	dh_install  "gcs.conf" "/etc"
-
-binary-indep:  build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf
-	dh_installdocs
-	dh_installcron
-	dh_installchangelogs
-	dh_installdirs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean install binary binary-indep binary-arch
-
-
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh  $@

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-09-25 22:48:44 +0000
@@ -0,0 +1,1 @@
+3.0 (native)

=== removed directory 'gcs'
=== modified file 'gcs.conf'
--- gcs.conf	2009-05-11 15:36:33 +0000
+++ gcs.conf	2010-09-25 22:48:44 +0000
@@ -6,7 +6,12 @@
 postinst_template: /usr/share/gcs/templates/postinst.template
 prerm_template: /usr/share/gcs/templates/prerm.template
 postrm_template: /usr/share/gcs/templates/postrm.template
+config_template: /usr/share/gcs/templates/config.template
 copyright_template: /usr/share/gcs/templates/copyright.template
-
-# Extensión en la que acaban los ficheros de configuración
-config_extension: .gv6
+sourceformat_template: /usr/share/gcs/templates/sourceformat.template
+
+## Final extension for the configuration files.
+config_extension: .gcs
+
+## This variable change the base path where you want to store the diversions.
+# diverts_basepath: /diverts

=== removed file 'gcs/changelog'
--- gcs/changelog	2008-03-25 17:29:55 +0000
+++ gcs/changelog	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-gcs (0.3.13) edgy; urgency=low
-
-  * Added support for desktop files.
-
- -- Junta de Andalucia <[e-mail]>  Tue, 25 Mar 2008 17:20:59 -0000
-
-
-gcs (0.3.12) edgy; urgency=low
-
-  * Added support for pre-depends.
-  * Added support for conflict fields.
-
- -- Gumersindo Coronel Pérez <[e-mail]>  Mon, 19 Mar 2007 09:00:14 -0000
-
-
-gcs (0.3.9) edgy; urgency=low
-
-  * 0.4 rc1.
-
- -- Gumersindo Coronel Pérez <[e-mail]>  Wed, 20 Dec 2006 11:55:20 -0000
-
-
-gcs (0.3.8) edgy; urgency=low
-
-  * Development release.
-  * Fixing a minor bug with skel.
-
- -- Gumersindo Coronel Pérez <[e-mail]>  Thu, 30 Nov 2006 16:08:22 -0000
-
-

=== removed directory 'gcs/conffiles_skel'
=== removed file 'gcs/depends'
--- gcs/depends	2008-03-25 17:29:55 +0000
+++ gcs/depends	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-# Dependencias del paquete. Un paquete por línea. Si se desea, se puede indicar la versión del paquete en una segunda columna
-# Ejemplos:
-#
-# gnome-terminal
-# nautilus  >=2.6.10
-#
-python
-python-syck
-python-support
-debhelper
-devscripts
-make
-fakeroot
-gcc

=== removed file 'gcs/info'
--- gcs/info	2008-03-25 17:29:55 +0000
+++ gcs/info	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-# YAML 1.1
-# Fichero de configuración de paquetes de personalización de Guadalinex v4
-
-# Nombre del paquete (minúsculas-separado-con-guiones)
-name: gcs
-
-# Autor 
-author: Junta de Andalucia <[e-mail]>
-
-# Priority
-priority: optional
-
-# Section
-section: admin
-
-shortdesc: "Sistema de configuración de Guadalinex v4"
-
-longdesc: "Consiste en un conjunto de herramientas que facilitan\n la creacion de metapaquetes y paquetes de configuración."
-
-# Versión del paquete
-version: 0.3.13
-
-# Cambios en esta versión
-changes:
-    - Added support for desktop files.
-

=== removed directory 'gcs/install_scripts'
=== removed file 'gcs/newfiles'
--- gcs/newfiles	2008-03-25 17:29:55 +0000
+++ gcs/newfiles	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# File/Dir      InstallDir
-builder.py      /usr/share/gcs
-config.py       /usr/share/gcs
-generators      /usr/share/gcs
-skel            /usr/share/gcs
-templates       /usr/share/gcs
-doc             /usr/share/gcs
-gcs_build       /usr/bin
-gcs_skel        /usr/bin 
-gcs.conf        /etc

=== removed directory 'gcs/newfiles_skel'
=== removed file 'gcs/predepends'
--- gcs/predepends	2008-03-25 17:29:55 +0000
+++ gcs/predepends	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Predependencias del paquete. Un paquete por línea. Si se desea, se puede indicar la versión del paquete en una segunda columna
-# Ejemplos:
-#
-# gnome-terminal
-# nautilus  >=2.6.10

=== removed directory 'gcs/remove_scripts'
=== removed file 'gcs/replaces'
--- gcs/replaces	2009-06-15 08:17:43 +0000
+++ gcs/replaces	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# Replaces del paquete. Un paquete por línea. Si se desea, se puede indicar la versión del paquete en una segunda columna
-# Ejemplos:
-#
-# gnome-terminal
-# nautilus  <=2.6.10

=== modified file 'gcs_build'
--- gcs_build	2008-03-25 17:29:55 +0000
+++ gcs_build	2010-09-25 22:48:44 +0000
@@ -7,8 +7,21 @@
 sys.setdefaultencoding('utf8')
 sys.path.insert(0, '/usr/share/gcs/')
 
+from optparse import OptionParser
 from builder import Builder
 
 if __name__ == "__main__":
+    parser = OptionParser()
+
+    parser.add_option('-S', '--sources',
+            dest="sources",
+            action="store_true",
+            help="debian source only, don't build binary files"
+            )
+    (options, args) = parser.parse_args()
+
     builder = Builder(os.getcwd())
     builder.make_package()
+
+    if not options.sources:
+        builder.build_package()

=== modified file 'generators/file.py'
--- generators/file.py	2009-06-17 09:08:22 +0000
+++ generators/file.py	2010-09-25 22:48:44 +0000
@@ -3,7 +3,6 @@
 
 import os
 import shutil
-import os.path
 import re
 import datetime
 import email.Utils
@@ -39,11 +38,27 @@
             print "Can't create template content. Template: %s" % template_name
 
 
+    def _copy_file(self, orig_path, dest_path, mode=0644, dirmode=0755):
+        real_orig_path = config['source_path'] + '/' + orig_path
+        real_dest_path = config['source_path'] + '/' + dest_path
+        try:
+            os.makedirs(os.path.dirname(real_dest_path), dirmode)
+        except OSError:
+            pass
+        shutil.copy(real_orig_path, real_dest_path)
+        os.chmod(real_dest_path, mode)
+
     
-    def _write_file(self, path):
-        real_file = open(config['source_path'] + '/' + path, 'w')
+    def _write_file(self, path, mode=0644, dirmode=0755):
+        real_path = config['source_path'] + '/' + path
+        try:
+            os.makedirs(os.path.dirname(real_path), dirmode)
+        except OSError:
+            pass
+        real_file = open(real_path, 'w')
         real_file.write(self.template_content)
         real_file.close()
+        os.chmod(real_path, mode)
 
 
 class ControlGenerator(FileGenerator):
@@ -65,6 +80,8 @@
         self.__set_predepends()
         self.__set_provides()
         self.__set_depends()
+        self.__set_recommends()
+        self.__set_suggests()
         self.__set_conflicts()
         self.__set_replaces()
         self.__set_section()
@@ -75,7 +92,8 @@
 
 
     def __set_name(self):
-        newcontent = self.template_content.replace('<NAME>', config['info']['name'])
+        name = config['info']['name']
+        newcontent = self.template_content.replace('<NAME>', name)
         self.template_content = newcontent
 
 
@@ -86,31 +104,43 @@
 
 
     def __set_predepends(self):
-        predepends = self.__parse_deps('/gcs/predepends')
+        predepends = self.__parse_list('/gcs/predepends')
         newcontent = self.template_content.replace('<PREDEPENDS>', predepends)
         self.template_content = newcontent
 
 
     def __set_depends(self):
-        depends = self.__parse_deps('/gcs/depends')
+        depends = self.__parse_list('/gcs/depends')
         newcontent = self.template_content.replace('<DEPENDS>', depends)
         self.template_content = newcontent
 
 
+    def __set_recommends(self):
+        recommends = self.__parse_list('/gcs/recommends')
+        newcontent = self.template_content.replace('<RECOMMENDS>', recommends)
+        self.template_content = newcontent
+
+
+    def __set_suggests(self):
+        suggests = self.__parse_list('/gcs/suggests')
+        newcontent = self.template_content.replace('<SUGGESTS>', suggests)
+        self.template_content = newcontent
+
+
     def __set_conflicts(self):
-        conflicts = self.__parse_deps('/gcs/conflicts')
+        conflicts = self.__parse_list('/gcs/conflicts')
         newcontent = self.template_content.replace('<CONFLICTS>', conflicts)
         self.template_content = newcontent
 
 
     def __set_replaces(self):
-        replaces = self.__parse_deps('/gcs/replaces')
+        replaces = self.__parse_list('/gcs/replaces')
         newcontent = self.template_content.replace('<REPLACES>', replaces)
         self.template_content = newcontent
 
 
     def __set_provides(self):
-        provides = self.__parse_deps('/gcs/provides')
+        provides = self.__parse_list('/gcs/provides')
         newcontent = self.template_content.replace('<PROVIDES>', provides)
         self.template_content = newcontent
 
@@ -132,28 +162,55 @@
         newcontent = newcontent.replace('<LONGDESC>', longdesc)
         self.template_content = newcontent
 
-    def __parse_deps(self, file):
+    def __parse_list(self, file):
         try:
-            depends_list = open(config['source_path'] + file).readlines()
+            input_list = open(config['source_path'] + file).readlines()
         except IOError:
-            #print "No existe el fichero gcs/predepends"
+            #print "No existe el fichero %s" % file
             return ''
+
+        # TODO: Improve this pseudo syntax check
+        p = re.compile(r"""
+        (?P<name>
+            .*
+        )
+        [ ]*
+        (?P<version>
+            [(]?
+            [<>=]+[ ]*.+
+            [)]?
+        )?
+        """, re.VERBOSE)
     
-        new_depends = []
-        for depend in depends_list:
-            depend = depend.strip()
-            if not depend or depend.startswith('#'):
+        output_list = []
+        for line in input_list:
+            line = line.strip()
+            if not line or line.startswith('#'):
                 continue
-            name_and_version = depend.split()
-
-            depend_string = name_and_version[0]
-            if len(name_and_version) == 2:
-                depend_string += " (%s)" %(name_and_version[1])
-
-            new_depends.append(depend_string)
-
-        depends = ', '.join(new_depends)
-        return depends
+
+            output_items = []
+            items_list = line.split('|')
+
+            for item in items_list:
+                m = p.match(item)
+                name = m.group('name')
+                version = m.group('version')
+
+                if not name:
+                    print "Error parsing %s" % file
+                    sys.exit(1)
+
+                item_string = name
+                if version:
+                    item_string += " (%s)" % version.strip('()')
+
+                output_items.append(item_string)
+
+            line_string = '| '.join(output_items)
+            output_list.append(line_string)
+
+        output_string = ', '.join(output_list)
+        return output_string
 
 
 
@@ -165,9 +222,9 @@
     """
 
     def __init__(self):
-        self.dhinstall_list = []
-        self.copy_list = []
-        self.dirs = []
+        self.install_list = []
+        self.links_list = []
+        self.dirs_list = []
         FileGenerator.__init__(self)
 
 
@@ -192,7 +249,7 @@
                 if (len(line_tuple) != 2) or line.startswith('#'):
                     continue
     
-                self.__add_dhinstall(*line_tuple)
+                self.__add_install(*line_tuple)
 
 
     def __process_skel(self, skel_name):
@@ -209,57 +266,79 @@
             if not '/.svn' in dirname:
                 dir_to_add = dirname[dest_stuff_len - 1:]
                 if dir_to_add:
-                    self.dirs.append(dirname[dest_stuff_len - 1:])    
+                    self.dirs_list.append(dirname[dest_stuff_len - 1:])    
 
             for fname in file_names:
                 base_path = dirname + os.sep + fname
                 orig_path = base_path[orig_stuff_len:]
                 dest_path = base_path[dest_stuff_len:]
 
-                if (not '/.svn' in orig_path) and\
-                        os.path.isfile(orig_path):
-                    dest_path = os.path.dirname(dest_path)
-                    self.__add_dhinstall(orig_path, dest_path)
-                elif os.path.islink(orig_path):
-                    dest_path = os.path.dirname(dest_path)
-                    self.__add_copy(orig_path, dest_path)
+                if ('/.svn' in orig_path):
+                    continue
+
+                if os.path.islink(orig_path):
+                    orig_path = os.readlink(base_path)
+                    self.__add_link(orig_path, dest_path)
+                elif os.path.isfile(orig_path):
+                    dest_path = os.path.dirname(dest_path)
+                    if skel_name == "conffiles_skel":
+                        dest_path = os.path.join(config['diverts_basepath'], dest_path)
+                    self.__add_install(orig_path, dest_path)
 
         os.path.walk(config['source_path'] + '/gcs/' + skel_name, 
                 set_dhinstall, None)
 
 
     def __write_rules_file(self):
-        dhinstall_content = '\n'.join(self.dhinstall_list)
-        copy_content = '\n'.join(self.copy_list)
-        commands_content = '\n'.join([dhinstall_content, copy_content])
+        dhinstall_content = ''
         newcontent = self.template_content.replace('<DHINSTALL_SLOT>', 
-                commands_content)
+                dhinstall_content)
         self.template_content = newcontent
 
-        self._write_file('debian/rules')
-        os.chmod(config['source_path'] + '/' + 'debian/rules', 0755)
+        self._write_file('debian/rules', 0755)
+
+        # write debian/install file
+        install_file = open(config['source_path'] + '/debian/install', 'w')
+        install_file.write('\n'.join(self.install_list))
+        install_file.close()
 
         # write debian/dirs file
         dirs_file = open(config['source_path'] + '/debian/dirs', 'w')
-        dirs_file.write('\n'.join(self.dirs))
+        dirs_file.write('\n'.join(self.dirs_list))
         dirs_file.close()
 
-
-    def __add_dhinstall(self, orig_path, dest_path):
-        if not dest_path:
-            return
-        #dest_path = os.path.dirname(dest_path)
-        command = ''
-	    # If we aren't working with config files or we are working with them but has the appropiate
-	    # extension fill the command
-        if not ('gcs/conffiles_skel/' in orig_path) or orig_path.endswith(config['config_extension']):
-            exclude_arg = ''
-            if os.path.isdir(orig_path + '/.svn'):
-                exclude_arg = '--exclude=.svn'
-            command = '\tdh_install %s "%s" "%s"' % (exclude_arg, orig_path, dest_path)
-
-        if command:
-            self.dhinstall_list.append(command)
+        # write debian/links file
+        links_file = open(config['source_path'] + '/debian/links', 'w')
+        links_file.write('\n'.join(self.links_list))
+        links_file.close()
+
+
+    def __add_install(self, orig_path, dest_path):
+        if not dest_path:
+            return
+        #dest_path = os.path.dirname(dest_path)
+        command = ''
+	    # If we aren't working with config files or we are working with them but has the appropiate
+	    # extension fill the command
+        if not ('gcs/conffiles_skel/' in orig_path) or orig_path.endswith(config['config_extension']):
+            command = orig_path + " " + dest_path
+
+        if command:
+            self.install_list.append(command)
+
+
+    def __add_link(self, orig_path, dest_path):
+        if not dest_path:
+            return
+        #dest_path = os.path.dirname(dest_path)
+        command = ''
+	    # If we aren't working with config files or we are working with them but has the appropiate
+	    # extension fill the command
+        if not ('gcs/conffiles_skel/' in orig_path) or orig_path.endswith(config['config_extension']):
+            command = orig_path + " " + dest_path
+
+        if command:
+            self.links_list.append(command)
 
 
     def __add_copy(self, orig_path, dest_path):
@@ -285,7 +364,7 @@
             self.actual_content = open(config['source_path'] + \
                 '/gcs/changelog').read()
             self.changelog_exists = True
-        except:
+        except Exception:
             self.actual_content = ''
             self.changelog_exists = False
 
@@ -293,7 +372,6 @@
 
 
     def activate(self):
-        debchangelog_path = config['source_path'] + '/debian/changelog'
         if self.__is_new_version():
             self.set_template_content('changelog_template')
 
@@ -303,9 +381,8 @@
             self.template_content += '\n\n' + self.actual_content
             self._write_file('gcs/changelog')
             self._write_file('debian/changelog')
-        elif self.changelog_exists and (not os.path.exists(debchangelog_path)):
-            orig_changelog_path = config['source_path'] + '/gcs/changelog'
-            shutil.copy(orig_changelog_path, debchangelog_path)
+        elif self.changelog_exists:
+            self._copy_file('gcs/changelog', 'debian/changelog')
 
 
     def __set_basic_info(self):
@@ -314,6 +391,8 @@
                 info['name'])
         newcontent = newcontent.replace('<VERSION>', 
                 str(info['version']))
+        newcontent = newcontent.replace('<DISTRIB>', 
+                os.popen('lsb_release -cs').read()[:-1])
         newcontent = newcontent.replace('<AUTHOR>', 
                 info['author'])
         newcontent = newcontent.replace('<DATE>',
@@ -367,18 +446,26 @@
         self.divert_content = ''
         self.scripts_path = ''
 
+        # Default DebConf slot for all derivated classes
+        self.debconf_content = '''
+## Source debconf library.
+. /usr/share/debconf/confmodule
+'''
+
 
     def activate(self):
         self.set_template_content(self.template_name)
         initial_content = self.template_content
+        initial_content = initial_content.replace('<DEBCONF_SLOT>', '')
         initial_content = initial_content.replace('<DIVERT_SLOT>', '')
         initial_content = initial_content.replace('<SCRIPTS_SLOT>', '')
         
+        self._set_debconf()
         self._set_divert()
         self._set_install_scripts()
 
         if initial_content != self.template_content:
-            self._write_file(self.file_path)
+            self._write_file(self.file_path, 0755)
         else:
             try:
                 os.remove(config['source_path'] + '/' + self.file_path)
@@ -386,6 +473,15 @@
                 pass
 
 
+    def _set_debconf(self):
+        if not config['questions']:
+            self.debconf_content = ''
+
+        newcontent = self.template_content.replace('<DEBCONF_SLOT>', 
+               self.debconf_content)
+        self.template_content = newcontent
+
+
     def _set_divert(self):
         newcontent = self.template_content.replace('<DIVERT_SLOT>', 
                self.divert_content)
@@ -446,6 +542,12 @@
         self.template_name = 'postrm_template'
         self.file_path = 'debian/postrm'
         self.scripts_path = 'gcs/remove_scripts/pos/'
+        self.debconf_content += '''
+if [ "$1" = "purge" ]; then
+    # Remove my changes to the db.
+    db_purge
+fi
+'''
 
 
 
@@ -457,8 +559,102 @@
 
 
 
+class SourceFormatGenerator(FileGenerator):
+
+    def activate(self):
+        self.set_template_content('sourceformat_template')
+        self._write_file('debian/source/format')
+
+
+
+class ConfigGenerator(FileGenerator):
+    """ Generate debian/config file from configuration, if it exists
+    """
+    def __init__(self):
+        self.dbinput_list = []
+        FileGenerator.__init__(self)
+
+    def __set_debconf_questions(self):
+        for question in config['questions']:
+            self.dbinput_list.append('db_input critical %s || true' % question['Template'])
+        dbinput_content = '\n'.join(self.dbinput_list)
+        newcontent = self.template_content.replace('<DBINPUT_SLOT>', dbinput_content)
+        self.template_content = newcontent
+
+    def activate(self):
+        """ Generate debian/config file
+
+        Steps:
+
+        1) Obtain control template
+        2) Set template content from configuration.
+        3) Write debian/config file
+        """
+        self.set_template_content('config_template')
+        initial_content = self.template_content
+        initial_content = initial_content.replace('<DBINPUT_SLOT>', '')
+        
+        # Allow custom configuration scripts
+        if os.path.exists(config['source_path'] + '/gcs/install_scripts/config'):
+            self._copy_file('gcs/install_scripts/config', 'debian/config', 0755)
+            pass
+
+        self.__set_debconf_questions()
+
+        if initial_content != self.template_content:
+            self._write_file('debian/config')
+        else:
+            try:
+                os.remove(config['source_path'] + '/config')
+            except:
+                pass
+
+
+class TemplatesGenerator(FileGenerator):
+    """ Generate debian/templates file
+    """
+    def __init__(self):
+        FileGenerator.__init__(self)
+        self.template_keys = ( 'Template', 'Type', 'Description' )
+
+
+    def _gen_template_content(self):
+        for question in config['questions']:
+            for key in self.template_keys: 
+                value = question[key].replace("\n", "\n  ")
+                value = re.sub(r'\n  $', '', value)
+                self.template_content += key + ': ' + value + "\n"
+            self.template_content += "\n"
+
+
+    def activate(self):
+        initial_content = self.template_content
+
+        self._gen_template_content()
+
+        if initial_content != self.template_content:
+            self._write_file('debian/templates')
+        else:
+            try:
+                os.remove(config['source_path'] + '/templates')
+            except:
+                pass
+
+
+
 class CopyrightGenerator(FileGenerator):
 
     def activate(self):
         self.set_template_content('copyright_template')
+
+        self.__set_author()
+
         self._write_file('debian/copyright')
+
+
+    def __set_author(self):
+        from datetime import date
+        today = date.today()
+        author = "Copyright %s, %s" % (today.year, config['info']['author'])
+        newcontent = self.template_content.replace('<AUTHOR>', author)
+        self.template_content = newcontent

=== modified file 'generators/part.py'
--- generators/part.py	2008-03-25 17:29:55 +0000
+++ generators/part.py	2010-09-25 22:48:44 +0000
@@ -60,17 +60,6 @@
                         abs_path.endswith(extension):
                     divert_method(dest_path)
 
-                desktop_extension = 'desktop' + extension
-                if fname.endswith(desktop_extension):
-                    if divert_method == self.__add_divert:
-                        real_conf_path = dest_path[: -len(extension)]
-                        command = "rm %s\n" % real_conf_path
-                        command += "cp %s %s\n\n" % (dest_path, real_conf_path)
-                        self.diverts.append(command)
-
-                    elif divert_method == self.__rm_divert:
-                        pass
-
         os.path.walk(config['source_path'] + '/gcs/conffiles_skel', 
                 set_divert, None)
                     
@@ -85,10 +74,11 @@
         pkg_name = config['info']['name']
         divert_command = '[ "%s" != "$(dpkg-divert --truename %s)" ] && rm -f %s && dpkg-divert --rename --remove %s\n' % (real_conf_path, real_conf_path, real_conf_path, real_conf_path)
 
-        divert_command += "dpkg-divert --package %s --rename " % pkg_name
-        divert_command += "--quiet --add %s\n" % real_conf_path
+        divert_command += "dpkg-divert --package %s " % pkg_name
+        divert_command += "--divert %s.distrib " % os.path.join(config['diverts_basepath'], real_conf_path[1:])
+        divert_command += "--rename --quiet --add %s\n\n" % real_conf_path
 
-        divert_command += "ln -fs %s %s\n\n" % (dest_path, real_conf_path)
+        divert_command += "ln -fs %s %s\n\n" % (os.path.join(config['diverts_basepath'], dest_path[1:]), real_conf_path)
 
         self.diverts.append(divert_command)
 

=== modified file 'skel/README.gcs'
--- skel/README.gcs	2008-03-25 17:29:55 +0000
+++ skel/README.gcs	2010-09-25 22:48:44 +0000
@@ -18,10 +18,15 @@
 
   * Fichero //changelog//. Contendrá los cambios realizados por las distintas versiones. Se genera automáticamente. No se debería tocar.
 
+  * Fichero //provides//. Describe los paquetes virtuales o no virtuales que este paquete proporciona.
+
   * Fichero //depends//. Contendrá las dependencias de nuestro paquete.
 
   * Fichero //predepends//. Contendrá las pre-dependencias de nuestro paquete.
 
+  * Fichero //recommends//. Contendrá las recomendaciones de nuestro paquete.
+  
+  * Fichero //suggests//. Contendrá las sugerencias de nuestro paquete.
 
 La sintaxis de cada fichero y una información más detallada están incluidos en cada uno de ellos.
 

=== modified file 'skel/gcs/depends'
--- skel/gcs/depends	2008-03-25 17:29:55 +0000
+++ skel/gcs/depends	2010-09-25 22:48:44 +0000
@@ -2,4 +2,4 @@
 # Ejemplos:
 #
 # gnome-terminal
-# nautilus  >=2.6.10
+# nautilus  (>=2.6.10)

=== modified file 'skel/gcs/info'
--- skel/gcs/info	2009-03-12 20:51:41 +0000
+++ skel/gcs/info	2010-09-25 22:48:44 +0000
@@ -11,7 +11,7 @@
 priority: optional
 
 # Section
-section: seccion de la aplicacion
+section: seccion_de_la_aplicacion
 
 # Descripción corta
 shortdesc: "descripción corta"

=== added directory 'skel/gcs/questions'
=== added file 'skel/gcs/questions/01first'
--- skel/gcs/questions/01first	1970-01-01 00:00:00 +0000
+++ skel/gcs/questions/01first	2010-09-25 22:48:44 +0000
@@ -0,0 +1,15 @@
+Template: foo/bar
+Type: string
+Default: foo
+Description: This is a sample string question.
+ This is its extended description.
+ .
+ Notice that:
+  - Like in a debian package description, a dot
+    on its own line sets off a new paragraph.
+  - Most text is word-wrapped, but doubly-indented
+    text is left alone, so you can use it for lists
+    of items, like this list. Be careful, since
+    it is not word-wrapped, if it's too wide
+    it will look bad. Using it for short items
+    is best (so this is a bad example).

=== added file 'skel/gcs/questions/02second'
--- skel/gcs/questions/02second	1970-01-01 00:00:00 +0000
+++ skel/gcs/questions/02second	2010-09-25 22:48:44 +0000
@@ -0,0 +1,4 @@
+Template: foo/baz
+Type: boolean
+Description: Clear enough, no?
+ This is another question, of boolean type.

=== modified file 'templates/changelog.template'
--- templates/changelog.template	2009-03-12 20:28:14 +0000
+++ templates/changelog.template	2010-09-25 22:48:44 +0000
@@ -1,4 +1,4 @@
-<NAME> (<VERSION>) jaunty; urgency=low
+<NAME> (<VERSION>) <DISTRIB>; urgency=low
 
 <CHANGES>
  -- <AUTHOR>  <DATE>

=== added file 'templates/config.template'
--- templates/config.template	1970-01-01 00:00:00 +0000
+++ templates/config.template	2010-09-25 22:48:44 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+## Source debconf library.
+. /usr/share/debconf/confmodule
+## Require debconf protocol version 2.0
+db_version 2.0 
+## This conf script is capable of backing up
+db_capb backup
+
+<DBINPUT_SLOT>
+
+db_go || true

=== modified file 'templates/control.template'
--- templates/control.template	2009-06-17 09:08:22 +0000
+++ templates/control.template	2010-09-25 22:48:44 +0000
@@ -3,14 +3,16 @@
 Priority: <PRIORITY>
 Maintainer: <MANTAINER>
 Build-Depends: debhelper (>= 7.0)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 
 Package: <NAME>
 Architecture: all
 Provides: <PROVIDES>
 Replaces: <REPLACES>
-Pre-Depends: <PREDEPENDS>
+Pre-Depends: ${misc:Depends}, <PREDEPENDS>
 Depends: <DEPENDS>
+Recommends: <RECOMMENDS>
+Suggests: <SUGGESTS>
 Conflicts: <CONFLICTS>
 Description: <SHORTDESC> 
  <LONGDESC>

=== modified file 'templates/copyright.template'
--- templates/copyright.template	2009-03-12 20:48:27 +0000
+++ templates/copyright.template	2010-09-25 22:48:44 +0000
@@ -1,4 +1,4 @@
-Copyright 2009, Junta de Andalucía.
+<AUTHOR>.
 
 This program is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free Software

=== modified file 'templates/postinst.template' (properties changed: +x to -x)
--- templates/postinst.template	2008-03-25 17:29:55 +0000
+++ templates/postinst.template	2010-09-25 22:48:44 +0000
@@ -1,6 +1,11 @@
-#!/bin/bash
+#!/bin/sh
+
+set -e
+
 #DEBHELPER#
 
+<DEBCONF_SLOT>
+
 <DIVERT_SLOT>
 
 <SCRIPTS_SLOT>

=== modified file 'templates/postrm.template' (properties changed: +x to -x)
--- templates/postrm.template	2008-03-25 17:29:55 +0000
+++ templates/postrm.template	2010-09-25 22:48:44 +0000
@@ -1,6 +1,11 @@
-#!/bin/bash
+#!/bin/sh
+
+set -e
+
 #DEBHELPER#
 
+<DEBCONF_SLOT>
+
 <DIVERT_SLOT>
 
 <SCRIPTS_SLOT>

=== modified file 'templates/preinst.template' (properties changed: +x to -x)
--- templates/preinst.template	2008-03-25 17:29:55 +0000
+++ templates/preinst.template	2010-09-25 22:48:44 +0000
@@ -1,6 +1,11 @@
-#!/bin/bash
+#!/bin/sh
+
+set -e
+
 #DEBHELPER#
 
+<DEBCONF_SLOT>
+
 <DIVERT_SLOT>
 
 <SCRIPTS_SLOT>

=== modified file 'templates/prerm.template' (properties changed: +x to -x)
--- templates/prerm.template	2008-03-25 17:29:55 +0000
+++ templates/prerm.template	2010-09-25 22:48:44 +0000
@@ -1,6 +1,11 @@
-#!/bin/bash
+#!/bin/sh
+
+set -e
+
 #DEBHELPER#
 
+<DEBCONF_SLOT>
+
 <DIVERT_SLOT>
 
 <SCRIPTS_SLOT>

=== modified file 'templates/rules.template' (properties changed: +x to -x)
--- templates/rules.template	2009-05-11 15:42:41 +0000
+++ templates/rules.template	2010-09-25 22:48:44 +0000
@@ -1,41 +1,16 @@
 #!/usr/bin/make -f
-
-build:
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -A
-
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh  $@
+
+install:
 <DHINSTALL_SLOT>
-
-binary-indep:  build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdebconf
-	dh_installdocs
-	dh_installcron
-	dh_installchangelogs
-	dh_installdirs
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: build clean install binary binary-indep binary-arch
-
-

=== added file 'templates/sourceformat.template'
--- templates/sourceformat.template	1970-01-01 00:00:00 +0000
+++ templates/sourceformat.template	2010-09-25 22:48:44 +0000
@@ -0,0 +1,1 @@
+1.0

=== modified file 'test_pkg/debian.orig/gcs-test-pkg/DEBIAN/conffiles'
--- test_pkg/debian.orig/gcs-test-pkg/DEBIAN/conffiles	2008-03-25 17:29:55 +0000
+++ test_pkg/debian.orig/gcs-test-pkg/DEBIAN/conffiles	2010-09-25 22:48:44 +0000
@@ -1,2 +1,2 @@
 /etc/test_pkg.conf
-/etc/lsb-release.gv4
+/etc/lsb-release.gcs

=== modified file 'test_pkg/debian.orig/gcs-test-pkg/DEBIAN/postinst'
--- test_pkg/debian.orig/gcs-test-pkg/DEBIAN/postinst	2008-03-25 17:29:55 +0000
+++ test_pkg/debian.orig/gcs-test-pkg/DEBIAN/postinst	2010-09-25 22:48:44 +0000
@@ -2,7 +2,7 @@
 
 
 dpkg-divert --package gcs-test-pkg --rename --quiet --add /etc/lsb-release
-ln -s /etc/lsb-release.gv4 /etc/lsb-release
+ln -s /etc/lsb-release.gcs /etc/lsb-release
 
 
 

=== renamed file 'test_pkg/debian.orig/gcs-test-pkg/etc/lsb-release.gv4' => 'test_pkg/debian.orig/gcs-test-pkg/etc/lsb-release.gcs'
=== modified file 'test_pkg/debian.orig/postinst'
--- test_pkg/debian.orig/postinst	2008-03-25 17:29:55 +0000
+++ test_pkg/debian.orig/postinst	2010-09-25 22:48:44 +0000
@@ -2,7 +2,7 @@
 #DEBHELPER#
 
 dpkg-divert --package gcs-test-pkg --rename --quiet --add /etc/lsb-release
-ln -s /etc/lsb-release.gv4 /etc/lsb-release
+ln -s /etc/lsb-release.gcs /etc/lsb-release
 
 
 

=== modified file 'test_pkg/debian.orig/rules'
--- test_pkg/debian.orig/rules	2008-03-25 17:29:55 +0000
+++ test_pkg/debian.orig/rules	2010-09-25 22:48:44 +0000
@@ -14,7 +14,7 @@
 
 	dh_install  test_pkg.conf /etc
 	dh_install  gcs/newfiles_skel/usr/share/test_pkg/newfile_example.txt usr/share/test_pkg
-	dh_install  gcs/conffiles_skel/etc/lsb-release.gv4 etc
+	dh_install  gcs/conffiles_skel/etc/lsb-release.gcs etc
 
 binary-indep:  build install