[SCM] hydrogen/master: Add fix for build failure of double installation of images.

[Andres Mejia]

Hi all,

This would fix a build failure I had where the error said I tried to
install images twice. I'm sure that all the original images are
installed still, but someone (Allesio) might want to double check to
see if they are all really installed.

I'm doing this to check for packages that might need to have source
changes in order to build with the latest upstream release of
libarchive. Luckily, hydrogen simply needs a binNMU.

On Sun, Dec 25, 2011 at 12:15 PM,  <ceros-guest at users.alioth.debian.org> wrote:
> The following commit has been merged in the master branch:
> commit 61cb472704d7f9be5998c777aa0f54c0635f0b8c
> Author: Andres Mejia <mcitadel at gmail.com>
> Date:   Sun Dec 25 12:14:54 2011 -0500
>
>    Add fix for build failure of double installation of images.
>
> diff --git a/debian/changelog b/debian/changelog
> index 3022654..0642d5b 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,16 @@
> +hydrogen (0.9.5-4) UNRELEASED; urgency=low
> +
> +  [ Alessio Treglia ]
> +  * hydrogen.desktop's Name entry should not repeat GenericName description
> +    (Closes: #640983)
> +  * Prevent FTBFS with -Werror=format-security enabled (Closes: #643406).
> +  * Small fix
> +
> +  [ Andres Mejia ]
> +  * Prevent build failure from double installation of images.
> +
> + -- Andres Mejia <amejia at debian.org>  Sun, 25 Dec 2011 12:14:18 -0500
> +
>  hydrogen (0.9.5-3) unstable; urgency=low
>
>   * Team upload.
> diff --git a/debian/patches/1007_installation_error_fix.patch b/debian/patches/1007_installation_error_fix.patch
> new file mode 100644
> index 0000000..6b55936
> --- /dev/null
> +++ b/debian/patches/1007_installation_error_fix.patch
> @@ -0,0 +1,14 @@
> +Author: Andres Mejia <amejia at debian.org>
> +Description: Prevent build failure with double installation of images.
> +
> +--- a/Sconstruct
> ++++ b/Sconstruct
> +@@ -303,7 +303,7 @@
> +       env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
> +
> +       #add every img in ./data/img to the install list.
> +-      os.path.walk("./data/img/",install_images,env)
> ++      #os.path.walk("./data/img/",install_images,env)
> +
> +
> +       env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/drumkits"))
> diff --git a/debian/patches/series b/debian/patches/series
> index 293e9ed..1505bdf 100644
> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -5,3 +5,4 @@
>  1004_indirect_linking.patch
>  1005_name_shouldnt_repeat_genericname.patch
>  1006_werror_format_security.patch
> +1007_installation_error_fix.patch
>
> --
> hydrogen packaging
>
> _______________________________________________
> pkg-multimedia-commits mailing list
> pkg-multimedia-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-commits



-- 
Regards,
Andres Mejia