From: Roland Mas <lolando@debian.org>
Date: Sun, 7 Feb 2010 21:01:46 +0000 (+0000)
Subject: Bugfix in the renaming
X-Git-Tag: v5_0_rc1~139
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=8e8661d663b4f9a593b2dedb7cfbab1daf6f801d

Bugfix in the renaming
---

diff --git a/gforge/deb-specific/dsf-helper.pl b/gforge/deb-specific/dsf-helper.pl
index cd80ef08a2..ec4021ea38 100755
--- a/gforge/deb-specific/dsf-helper.pl
+++ b/gforge/deb-specific/dsf-helper.pl
@@ -73,6 +73,8 @@ sub get_chunk {
 @package_list = split /\n/, qx! dh_listpackages ! ;
 my $package_name = qx! grep ^PACKAGE= debian/rules | cut -d= -f2 ! ;
 $package_name =~ s/\n//;
+my $old_package_name = qx! grep ^OLDPACKAGE= debian/rules | cut -d= -f2 ! ;
+$old_package_name =~ s/\n//;
 my $forge_name = qx! grep ^FORGENAME= debian/rules | cut -d= -f2 ! ;
 $forge_name =~ s/\n//;
 
@@ -125,6 +127,7 @@ if ($ARGV[0] && $ARGV[0] eq "--clean") {
 	   $dest =~ s/\n\n+/\n\n/g ;
        }
        $dest =~ s/\@PACKAGE\@/$package_name/g ;
+       $dest =~ s/\@OLDPACKAGE\@/$old_package_name/g ;
        $dest =~ s/\@FORGENAME\@/$forge_name/g ;
 
        open D, "> $destfile" ;
diff --git a/gforge/debian/changelog b/gforge/debian/changelog
index e13bfee165..0a1473ef7e 100644
--- a/gforge/debian/changelog
+++ b/gforge/debian/changelog
@@ -1,10 +1,10 @@
-fusionforge (4.8.55-2) experimental; urgency=low
+fusionforge (4.8.55-2) unstable; urgency=low
 
   * Renamed source package.
   * Also renamed binary meta-packages, now split into three parts:
     fusionforge-basic, fusionforge-standard and fusionforge-full.
 
- -- Roland Mas <lolando@debian.org>  Sun, 07 Feb 2010 20:46:14 +0100
+ -- Roland Mas <lolando@debian.org>  Sun, 07 Feb 2010 21:04:48 +0100
 
 gforge (4.8.55-1) experimental; urgency=low
   
diff --git a/gforge/debian/rules b/gforge/debian/rules
index 6c83f4da60..d00510630f 100755
--- a/gforge/debian/rules
+++ b/gforge/debian/rules
@@ -20,7 +20,7 @@ include /usr/share/dpatch/dpatch.make
 CRONDFILES=$(patsubst packaging/cron.d/%,debian/$(OLDPACKAGE)-%.cron.d,$(wildcard packaging/cron.d/[a-z]*))
 DIRSFILES=$(patsubst packaging/dirs/%,debian/$(OLDPACKAGE)-%.dirs,$(wildcard packaging/dirs/[a-z]*))
 INSTALLFILES=$(patsubst packaging/install/%,debian/$(OLDPACKAGE)-%.install,$(wildcard packaging/install/[a-z]*))
-DOCSFILES=$(patsubst packaging/docs/oldpkgname%,debian/$(OLDPACKAGE)%.docs,$(wildcard packaging/docs/pkgname*)) $(patsubst packaging/docs/pkgname%,debian/$(PACKAGE)%.docs,$(wildcard packaging/docs/pkgname*))
+DOCSFILES=$(patsubst packaging/docs/oldpkgname%,debian/$(OLDPACKAGE)%.docs,$(wildcard packaging/docs/oldpkgname*)) $(patsubst packaging/docs/pkgname%,debian/$(PACKAGE)%.docs,$(wildcard packaging/docs/pkgname*))
 POFILES=$(patsubst debian/dsf-po/%,debian/po/%,$(wildcard debian/dsf-po/*) debian/po/POTFILES.in)
 
 remove-binary-files:
@@ -38,8 +38,10 @@ debian/$(OLDPACKAGE)-%.dirs:
 debian/$(OLDPACKAGE)-%.install:
 	cp $(CURDIR)/packaging/install/$* $@ 
 
-debian/%.docs:
-	cp $(CURDIR)/packaging/docs/$(patsubst $(OLDPACKAGE)%,pkgname%,$*) $@
+debian/$(OLDPACKAGE)-%.docs:
+	cp $(CURDIR)/packaging/docs/$(patsubst $(OLDPACKAGE)%,oldpkgname%,$*) $@
+debian/$(PACKAGE)-%.docs:
+	cp $(CURDIR)/packaging/docs/$(patsubst $(PACKAGE)%,pkgname%,$*) $@
 
 debian/control: $(wildcard packaging/control/*)
 	ls $(CURDIR)/packaging/control/[0-9][0-9][0-9]* | grep -v shortdesc | grep -v scmcpold | while read file ; do cat $${file}; if [ -f $${file}.shortdesc ] ; then cat $(CURDIR)/packaging/control/AAAdesc; echo ' .'; cat $${file}.shortdesc; fi; echo '';  done | $(SED_REPLACE) > $@