summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-18 06:38:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-18 06:38:14 +0000
commite0b9985719de4fc72dbec1fa869c551320657199 (patch)
tree2258d343b4002629c23344ec6307f58b3c1dd32d
parentf1dd7710f75f267b86a514c76bbb2bf5214fd64d (diff)
downloaddrakx-e0b9985719de4fc72dbec1fa869c551320657199.tar
drakx-e0b9985719de4fc72dbec1fa869c551320657199.tar.gz
drakx-e0b9985719de4fc72dbec1fa869c551320657199.tar.bz2
drakx-e0b9985719de4fc72dbec1fa869c551320657199.tar.xz
drakx-e0b9985719de4fc72dbec1fa869c551320657199.zip
0.5
Diffstat
-rw-r--r--advertising/Makefile2
-rw-r--r--advertising/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/advertising/Makefile b/advertising/Makefile
index ad85ebdc8..e60ce7f79 100644
--- a/advertising/Makefile
+++ b/advertising/Makefile
@@ -1,4 +1,4 @@
-VERSION = 0.4
+VERSION = 0.5
PRODUCT = drakx-installer-advertising
THEME = pwp
diff --git a/advertising/NEWS b/advertising/NEWS
index e73a80fd0..7d8bc54d2 100644
--- a/advertising/NEWS
+++ b/advertising/NEWS
@@ -1,3 +1,5 @@
+Version 0.5 - 18 September 2007, by Pascal "Pixel" Rigaux
+
- fix 02IM_MIGRATION.png screenshot
Version 0.4 - 17 September 2007, by Pascal "Pixel" Rigaux
generated by cgit v1.2.1 (git 2.21.0) at 2024-08-10 10:22:01 +0000
ts, qw(gurpmi); push @sbin_scripts, qw(gurpmi2); } # And now, add some functionality to MakeMaker. package MY; # Don't install gurpmi.pm if we don't install gui sub libscan { my ($self, $path) = @_; if (!$with_gui && $path =~ /gurpmi/) { return '' } return $path; } # Make proper sbin/man5/man8 dirs in blib sub top_targets { my $inherited = shift->SUPER::top_targets(@_); $inherited =~ s/^config ::/$& \$(INST_MAN5DIR)\$(DIRFILESEP).exists \$(INST_MAN8DIR)\$(DIRFILESEP).exists \$(INST_SBIN)\$(DIRFILESEP).exists/m; $inherited; } # Install sbin_scripts in sbin under blib sub installbin { my $self = shift; my $inherited = $self->SUPER::installbin(@_); my $s = join '|', map quotemeta, @sbin_scripts; $inherited =~ s{\$\(INST_SCRIPT\)/($s)}{\$(INST_SBIN)/$1}g; # how to create needed directories under blib $inherited .= $self->dir_target("\$(INST_$_)") for qw(SBIN MAN5DIR MAN8DIR); $inherited; } sub install { my $inherited = shift->SUPER::install(@_); # Take into account scripts in sbin under blib # and new manpage sections $inherited =~ s/\$\(INST_BIN\) \$\(DESTINSTALL(\w*)BIN\)/$& \$(INST_SBIN) \$(DESTINSTALL$1SBIN) \$(INST_MAN5DIR) \$(DESTINSTALLMAN5DIR) \$(INST_MAN8DIR) \$(DESTINSTALLMAN8DIR)/g; # install files under /etc and /var my $po = $with_po ? ' installpo' : ''; my $gui = $with_gui ? ' installgurpmi2' : ''; $inherited =~ s/^install ::/$& installconfigfiles installstatedir$po$gui/gm; $inherited; } # Due to some hateful layout (that I can't change because the whole stuff is # hosted in CVS (double hate)) I need to add pm_to_blib in the phonic targets. sub special_targets { my $inherited = shift->SUPER::special_targets(@_); $inherited =~ s/PHONY:/$& pm_to_blib/; $inherited; } sub manifypods { my $inherited = shift->SUPER::manifypods(@_); #- TODO repartition of man pages in sections by pod2man is incorrect #- TODO as more languages are added adapt the following quick hack $inherited; } # to generate the ChangeLog depending on the checkout layout my $commonusername = "../common/"; -d $commonusername or do { $commonusername = "../../common/"; -d $commonusername or do { $commonusername = "../../../common/"; -d $commonusername or $commonusername = ""; }; }; # Additional targets sub postamble { <<"**MM**"; .PHONY: installconfigfiles installstatedir ChangeLog TAGS installpo: \$(MAKE) -C po install installconfigfiles: install -d \$(SYSCONFDIR)/urpmi install -m 644 inst.list skip.list \$(SYSCONFDIR)/urpmi installstatedir: install -d \$(LOCALSTATEDIR)/urpmi install -d \$(DESTDIR)/var/cache/urpmi/partial install -d \$(DESTDIR)/var/cache/urpmi/headers install -d \$(DESTDIR)/var/cache/urpmi/rpms installgurpmi2: pure_install ln -s -f consolehelper \$(DESTINSTALLSCRIPT)/gurpmi2 ChangeLog: svn2cl --accum --authors ${commonusername}username.xml rm -f *.bak TAGS: etags *.pm */*.pm testall: make test sudo make test TEST_FILES='t/superuser--*.t' **MM** } # Back to our schedule package main; WriteMakefile( NAME => 'urpmi', PREREQ_PM => { 'Locale::gettext' => '1.01', 'MDV::Packdrakeng' => '1.01', 'URPM' => '1.48', }, VERSION_FROM => 'urpm.pm', macro => { DESTINSTALLSBIN => '$(DESTINSTALLBIN)/../sbin', DESTINSTALLSITESBIN => '$(DESTINSTALLSITEBIN)/../sbin', DESTINSTALLVENDORSBIN => '$(DESTINSTALLVENDORBIN)/../sbin', INSTALLMAN5DIR => '$(PERLPREFIX)/share/man/man5', DESTINSTALLMAN5DIR => '$(DESTDIR)$(INSTALLMAN5DIR)', INSTALLMAN8DIR => '$(PERLPREFIX)/share/man/man8', DESTINSTALLMAN8DIR => '$(DESTDIR)$(INSTALLMAN8DIR)', INST_SBIN => 'blib/sbin', INST_MAN5DIR => 'blib/man5', INST_MAN8DIR => 'blib/man8', # We could read those values from rpm macros. SYSCONFDIR => '$(DESTDIR)/etc', LOCALSTATEDIR => '$(DESTDIR)/var/lib', }, EXE_FILES => [ @bin_scripts, @sbin_scripts ], PMLIBDIRS => [ qw(urpm) ], $with_po ? (DIR => [ 'po' ]) : (), MAN1PODS => { map { my $targ = $_; $targ =~ s{^pod/}{}; $targ =~ s/\.(\d)\.pod$//; my $section = $1 || 1; ( $_ => "\$(INST_MAN${section}DIR)/$targ.$section" ); } <pod/*.pod>, $with_po ? <pod/*/*.pod> : () }, dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" }, );
generated by cgit v1.2.1 (git 2.21.0) at 2024-08-10 10:22:01 +0000