[Pkg-puppet-devel] Inclusion of new/updated puppet module packages

[Michael Weiser]

Hi Thomas,
Hi all,

On Fri, Nov 21, 2014 at 07:40:24AM +0100, Thomas Bechtold wrote:

> > packages. Are you going to do that yourself or should I look into
> > creating new branches and pushing them?
> AFAIR you just have to call gbp-import-orig [1] to add a new version.
> I'm not going to update the packages. I more or less currently inactive
> due to lack of time.

Okay, I've done that and it seems to be fine. Shall I just push it?

An example what that would look like:

commit 3950f970b47b023f53d522671fc3c7671f84b885
Author: Michael Weiser <michael.weiser at gmx.de>
Date:   Fri Nov 21 12:26:35 2014 +0100

    Imported upstream relase 1.1.2
    
    Also fix script permissions and add ruby as dependency.

commit e7345aa12adb7aae83295359f149d854398a700b
Merge: 8a76999 8fb26e3
Author: Michael Weiser <michael.weiser at gmx.de>
Date:   Fri Nov 21 12:22:53 2014 +0100

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2

commit 8fb26e39512b43b82df3eb6ed60e6b9b5e9c4559
Author: Michael Weiser <michael.weiser at gmx.de>
Date:   Fri Nov 21 12:22:53 2014 +0100

    Imported Upstream version 1.1.2

commit 8a76999074d751a2fa3eee63926b2ef844d8293e
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Fri Oct 24 22:11:30 2014 +0200

    releasing package puppet-module-puppetlabs-concat version 1.1.1-1

Diff:

diff --git a/debian/changelog b/debian/changelog
index cfed611..1d85240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+puppet-module-puppetlabs-concat (1.1.2-1) unstable; urgency=medium
+
+  * Imported upstream release 1.1.2
+  * Fix concatfragments.rb script permissions and add ruby as explicit
+    dependency for it.
+
+ -- Michael Weiser <michael.weiser at gmx.de>  Fri, 21 Nov 2014 12:24:16 +0100
+
 puppet-module-puppetlabs-concat (1.1.1-1) unstable; urgency=medium
 
   * Imported upstream relase 1.1.1
diff --git a/debian/control b/debian/control
index 7012e7d..77af49e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Package: puppet-module-puppetlabs-concat
 Architecture: all
 Depends: ${misc:Depends},
          puppet-module-puppetlabs-stdlib,
-         puppet-common (>= 3)
+         puppet-common (>= 3),
+         ruby
 Description: Puppet module for concat
  Puppet lets you centrally manage every important aspect of your system
  using a cross-platform specification language that manages all the
diff --git a/debian/rules b/debian/rules
index 1bef3f9..c4356e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,4 @@
 
 override_dh_install:
        dh_install -X.gitignore
+       chmod +x debian/puppet-module-puppetlabs-concat/usr/share/puppet/modules.available/puppetlabs-concat/files/concatfragments.rb
-- 
Micha