Changeset 29611 for main/trunk/package-kits/linux/perllib/Greenstone/Package/_apt.pm

Timestamp:

2014-12-12T17:11:12+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Changes to get RPM working. May have broken Pacman and APT, since I had to change the way it is done.

File:

• main/trunk/package-kits/linux/perllib/Greenstone/Package/_apt.pm (modified) (3 diffs)

main/trunk/package-kits/linux/perllib/Greenstone/Package/_apt.pm

@@ -58 +58 @@
 }
 
+# Adds a definition for files included in a subpackage
+sub add_package_files {
+    my $self = shift;
+    my $file = "$self->{output}/debian/$self->{config}->{NAME}.install";
+    print "    - $file\n";
+    open my $INSTALL, '>', $file;
+    for my $line (@{$self->{config}->{FILES}}) {
+        print $INSTALL $line, "\n";
+    }
+    close $INSTALL;
+}
+
 # Handles the apt-specific package generation
 sub add_package_impl {
@@ -78 +90 @@
     }
     if (defined $packages) {
+        my @names;
+        # add main package
+        push @names, $self->{config}->{NAME};
+        $self->add_install ($self->{config}->{NAME});
+        $self->add_package_section ($CONTROL);
+        $self->add_package_files;
+
         my $config = $self->{config};
-        my @names;
+        # add subpackages
         for my $package (@{$packages}) {
             push @names, $package->{NAME};
@@ -86 +105 @@
             $self->add_install ($package->{NAME});
             $self->add_package_section ($CONTROL);
-            my $install = "$self->{output}/debian/$self->{config}->{NAME}.install";
-            open my $INSTALL, '>', $install;
-            for my $line (@{$self->{config}->{FILES}}) {
-                print $INSTALL $line, "\n";
-            }
-            close $INSTALL;
+            $self->add_package_files;
         }
         $self->{config} = $config;