diff -u backuppc-3.1.0/debian/changelog backuppc-3.1.0/debian/changelog
--- backuppc-3.1.0/debian/changelog
+++ backuppc-3.1.0/debian/changelog
@@ -1,3 +1,13 @@
+backuppc (3.1.0-3ubuntu3) intrepid; urgency=low
+
+ * Add dpatch system to package.
+ - debian/control: Add build dependency on dpatch.
+ - debian/rules: Add dpatch targets.
+ * Add missing "use Encode" in sendEmail. (LP: #430879)
+ * Fix encoding of special characters in french translation. (LP: #373327)
+
+ -- Michael Jeanson Fri, 18 Sep 2009 15:04:17 -0400
+
backuppc (3.1.0-3ubuntu2) intrepid; urgency=low
* Drop build dependency "par2". It is in universe.
diff -u backuppc-3.1.0/debian/rules backuppc-3.1.0/debian/rules
--- backuppc-3.1.0/debian/rules
+++ backuppc-3.1.0/debian/rules
@@ -5,6 +5,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/dpatch/dpatch.make
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
CFLAGS += -g
@@ -14,7 +15,7 @@
endif
configure: configure-stamp
-configure-stamp:
+configure-stamp: patch-stamp
dh_testdir
# Add here commands to configure the package.
@@ -32,7 +33,7 @@
touch build-stamp
-clean:
+clean: unpatch
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
diff -u backuppc-3.1.0/debian/control backuppc-3.1.0/debian/control
--- backuppc-3.1.0/debian/control
+++ backuppc-3.1.0/debian/control
@@ -4,7 +4,7 @@
Maintainer: Ubuntu Core Developers
XSBC-Original-Maintainer: Ludovic Drolez
Build-Depends-Indep: perl (>= 5.6.0), patch
-Build-Depends: debhelper (>= 4.1.16)
+Build-Depends: debhelper (>= 4.1.16), dpatch
Standards-Version: 3.7.3
Package: backuppc
only in patch2:
unchanged:
--- backuppc-3.1.0.orig/debian/patches/fix-french-encoding.dpatch
+++ backuppc-3.1.0/debian/patches/fix-french-encoding.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-french-encoding.dpatch by Michael Jeanson
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix encoding of special characters.
+
+@DPATCH@
+diff -urNad backuppc-3.1.0~/lib/BackupPC/Lang/fr.pm backuppc-3.1.0/lib/BackupPC/Lang/fr.pm
+--- backuppc-3.1.0~/lib/BackupPC/Lang/fr.pm 2007-11-25 22:00:07.000000000 -0500
++++ backuppc-3.1.0/lib/BackupPC/Lang/fr.pm 2009-09-16 14:25:51.000000000 -0400
+@@ -51,7 +51,7 @@
+
+@@ -127,9 +127,9 @@
+
+
+ - Ce statut a été généré le \$now.
+-
- L\'espace de stockage a ?t? r?cemment rempli ? \$Info{DUlastValue}%
+- (\$DUlastTime), le maximum aujourd\'hui a ?t? de \$Info{DUDailyMax}% (\$DUmaxTime)
+- et hier le maximum ?tait \$Info{DUDailyMaxPrev}%.
++
- L\'espace de stockage a été récemment rempli à \$Info{DUlastValue}%
++ (\$DUlastTime), le maximum aujourd\'hui a été de \$Info{DUDailyMax}% (\$DUmaxTime)
++ et hier le maximum était \$Info{DUDailyMaxPrev}%.
+
+
+
only in patch2:
unchanged:
--- backuppc-3.1.0.orig/debian/patches/00list
+++ backuppc-3.1.0/debian/patches/00list
@@ -0,0 +1,2 @@
+add-use-encoding-in-sendemail
+fix-french-encoding
only in patch2:
unchanged:
--- backuppc-3.1.0.orig/debian/patches/add-use-encoding-in-sendemail.dpatch
+++ backuppc-3.1.0/debian/patches/add-use-encoding-in-sendemail.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add-use-encoding-in-sendemail.dpatch by Michael Jeanson
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add use Encode to sendEmail.
+
+@DPATCH@
+diff -urNad backuppc-3.1.0~/bin/BackupPC_sendEmail backuppc-3.1.0/bin/BackupPC_sendEmail
+--- backuppc-3.1.0~/bin/BackupPC_sendEmail 2007-11-25 22:00:07.000000000 -0500
++++ backuppc-3.1.0/bin/BackupPC_sendEmail 2009-09-16 14:07:15.000000000 -0400
+@@ -42,6 +42,7 @@
+ use lib "__INSTALLDIR__/lib";
+ use BackupPC::Lib;
+ use BackupPC::FileZIO;
++use Encode;
+
+ use Data::Dumper;
+ use Getopt::Std;