Merge lp:~noskcaj/ubuntu/utopic/backuppc/merge into lp:ubuntu/utopic/backuppc

[Jackson Doak]

Merge from debain

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'bin/BackupPC_archive'
--- bin/BackupPC_archive	2014-01-15 09:33:13 +0000
+++ bin/BackupPC_archive	2014-08-21 21:13:55 +0000
@@ -299,7 +299,7 @@
     if ( $NeedPostCmd ) {
         UserCommandRun("ArchivePostUserCmd");
         if ( $? && $Conf{UserCmdCheckStatus} ) {
-            $stat{hostError} = "RestorePreUserCmd returned error status $?";
+            $stat{hostError} = "ArchivePostUserCmd returned error status $?";
             $stat{xferOK} = 0;
         }
     }

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-15 09:33:13 +0000
+++ debian/changelog	2014-08-21 21:13:55 +0000
@@ -1,3 +1,26 @@
+backuppc (3.3.0-2ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - debian/backuppc.init, debian/rules, debian/postinst: Do not call init
+      script on shutdown and reboot (TearDown) (Closes: #488660).
+    - debian/control:
+      + Depend on default-mta | mail-transport-agent, instead of enumerating a
+        long list of alternative MTAs.
+      + Drop build dependency to 'par2', it's in universe.
+      + Add build dependency on libsocket6-perl
+    - configure.pl: Do not test for par2 being available at build time.
+
+ -- Jackson Doak <[e-mail]>  Fri, 22 Aug 2014 06:59:23 +1000
+
+backuppc (3.3.0-2) unstable; urgency=low
+
+  * Depends on apache2-utils
+  * removed a superfluous libtime-modules-perl. Closes: #734356
+  * Typo in log message fixed. Closes: #731087
+  * using dpkg-buildflags
+
+ -- Ludovic Drolez <[e-mail]>  Thu, 06 Feb 2014 12:41:22 +0100
+
 backuppc (3.3.0-1ubuntu1) trusty-proposed; urgency=low
 
   * Merge from Debian unstable. Remaining changes: (LP: #1201029)
@@ -14,7 +37,7 @@
 
   * New upstream release. Closes: #716824
   * Fix Typo in kill signal name (ALRM vs ARLM). Closes: #698441
-  * Enable Apache2 (2.4) configuration by default. Closes: #718550 #710956
+  * Enable Apache2 (2.4) configuration by default in debconf.
 
  -- Ludovic Drolez <[e-mail]>  Thu, 12 Sep 2013 6:13:50 +0200
 

=== modified file 'debian/control'
--- debian/control	2014-01-15 09:33:13 +0000
+++ debian/control	2014-08-21 21:13:55 +0000
@@ -4,11 +4,11 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ludovic Drolez <[e-mail]>
 Build-Depends: debhelper (>= 5), perl (>= 5.6.0), patch, libsocket6-perl
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 
 Package: backuppc
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>=1.8.3), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping | inetutils-ping, ucf, libtime-modules-perl, libwww-perl, libsocket6-perl
+Depends: ${shlibs:Depends}, ${perl:Depends}, libdigest-md5-perl, libcompress-zlib-perl, libarchive-zip-perl, tar (>> 1.13), adduser (>=3.9), dpkg (>= 1.15.7.2), apache2 | httpd, ${misc:Depends}, smbclient, samba-common-bin, bzip2, default-mta | mail-transport-agent, iputils-ping | inetutils-ping, ucf, libtime-modules-perl, libwww-perl, apache2-utils
 Recommends: rsync, libfile-rsyncp-perl (>= 0.68), openssh-client | ssh-client, rrdtool, libio-dirent-perl
 Suggests: w3m | www-browser, par2
 Conflicts: libfile-rsyncp-perl (<< 0.68)

=== modified file 'debian/postinst'
--- debian/postinst	2014-01-15 09:33:13 +0000
+++ debian/postinst	2014-08-21 21:13:55 +0000
@@ -141,6 +141,10 @@
     
     # ucf stuff
     ucf --debconf-ok --three-way /usr/share/backuppc/conf/config.pl /etc/backuppc/config.pl
+
+    # remove conffile
+    #dpkg-maintscript-helper rm_conffile /etc/backuppc/config.pl 3.3.0-1 backuppc -- "$@";
+    
     
     # change the rights of /etc/backuppc so that the CGI can modify the conf.
     chown -R backuppc:www-data /etc/backuppc

=== modified file 'debian/rules'
--- debian/rules	2014-01-15 09:33:13 +0000
+++ debian/rules	2014-08-21 21:13:55 +0000
@@ -5,6 +5,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -g
@@ -20,6 +24,8 @@
 
 	touch configure-stamp
 
+build-arch: build
+build-indep: build
 
 build: build-stamp
 
@@ -27,10 +33,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	#$(MAKE)
-	#/usr/bin/docbook-to-man debian/backuppc.sgml > backuppc.1
-	cc debian/setuidwrapper.c -o index.cgi
-
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) debian/setuidwrapper.c -o index.cgi
 	touch build-stamp
 
 clean: