Bug#441621: NMU diff

[Bastian Blank]

NMU diff.

Bastian

-- 
Behind every great man, there is a woman -- urging him on.
                -- Harry Mudd, "I, Mudd", stardate 4513.3

diff -u bacula-2.2.5/debian/patches/fix_config 
bacula-2.2.6/debian/patches/fix_config
--- bacula-2.2.5/debian/patches/fix_config
+++ bacula-2.2.6/debian/patches/fix_config
@@ -11 +11 @@
-cat $1 | sed -e [EMAIL PROTECTED]@~g | sed -r -f `dirname $0`/fix_config.sed > 
$2
+cat $1 | sed -e s~`uname -n | cut -d '.' -f [EMAIL PROTECTED]@~g | sed -r -f 
`dirname $0`/fix_config.sed > $2
diff -u bacula-2.2.5/debian/changelog bacula-2.2.6/debian/changelog
--- bacula-2.2.5/debian/changelog
+++ bacula-2.2.6/debian/changelog
@@ -1,3 +1,13 @@
+bacula (2.2.6-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+    - Release stdout/stderr on daemonization. (closes: #441621)
+  * Fix symlinks case for strippath in File Set. (closes: #452200)
+  * Fix hostname replace in default config.
+
+ -- Bastian Blank <[EMAIL PROTECTED]>  Tue, 27 Nov 2007 13:59:29 +0000
+
 bacula (2.2.5-1) unstable; urgency=medium
 
   * New upstream release.
--- bacula-2.2.6.orig/src/filed/backup.c
+++ bacula-2.2.6/src/filed/backup.c
@@ -1151,7 +1151,7 @@
     * I.e. if either stripping fails don't strip anything.
     */
    if (do_strip(ff_pkt->strip_path, ff_pkt->fname)) {
-      if (ff_pkt->fname != ff_pkt->link) {
+      if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
          pm_strcpy(ff_pkt->link_save, ff_pkt->link);
          if (!do_strip(ff_pkt->strip_path, ff_pkt->link)) {
             strcpy(ff_pkt->link, ff_pkt->link_save);
@@ -1170,7 +1170,7 @@
       return;
    }
    strcpy(ff_pkt->fname, ff_pkt->fname_save);
-   if (ff_pkt->fname != ff_pkt->link) {
+   if (ff_pkt->type != FT_LNK && ff_pkt->fname != ff_pkt->link) {
       strcpy(ff_pkt->link, ff_pkt->link_save);
    }
 }