← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nzbget/trusty

« back to all changes in this revision

Viewing changes to libpar2-0.2-bugfixes.patch

  • Committer: Package Import Robot
  • Author(s): Andreas Moog
  • Date: 2013-07-18 14:50:28 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20130718145028-48qbia23dx6sg8u1
Tags: 11.0+dfsg-0ubuntu1
* Repackage original tarball to remove copies of jquery and twitter-
  bootstrap
* debian/watch: Update for new versioning scheme
* debian/patches: Remove all old patches, add one patch:
  - dont-embed-libraries.patch: Don't install embedded jquery and bootstrap 
    libraries
* debian/combat: Upgrade to debhelper combat 9
* debian/control:
  - Fix Vcs-Git field
  - Adjust debhelper version for combat level 9
  - Add jquery and bootstrap to depends for integrated webserver
  - Add python to recommends for post-processing scripts
  - Bump build-depends on libpar2-dev to support the cancel function
* debian/links:
  - Use the system jquery and bootstrap libraries
* debian/rules:
  - Add get-orig-source target to build modified upstream tarball.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpar2-0.2-bugfixes.patch
1
 
diff -aud ../libpar2-0.2-original/par2repairer.cpp ../libpar2-0.2/par2repairer.cpp
 
1
diff -aud -U 5 ../libpar2-0.2-original/par2repairer.cpp ../libpar2-0.2/par2repairer.cpp
2
2
--- ../libpar2-0.2-original/par2repairer.cpp    2006-01-20 18:25:20.000000000 +0100
3
 
+++ ../libpar2-0.2/par2repairer.cpp     2008-02-06 12:02:53.226050300 +0100
4
 
@@ -78,6 +78,7 @@
 
3
+++ ../libpar2-0.2/par2repairer.cpp     2012-11-30 14:23:31.000000000 +0100
 
4
@@ -76,10 +76,11 @@
 
5
     ++sf;
 
6
   }
5
7
 
6
8
   delete mainpacket;
7
9
   delete creatorpacket;
9
11
 }
10
12
 
11
13
 
12
 
@@ -1261,7 +1262,7 @@
 
14
 Result Par2Repairer::PreProcess(const CommandLine &commandline)
 
15
 {
 
16
@@ -1259,11 +1260,11 @@
 
17
         string path;
 
18
         string name;
13
19
         DiskFile::SplitFilename(filename, path, name);
14
20
 
15
21
         cout << "Target: \"" << name << "\" - missing." << endl;
18
24
       }
19
25
     }
20
26
 
21
 
@@ -1804,7 +1805,7 @@
 
27
     ++sf;
 
28
   }
 
29
@@ -1802,11 +1803,11 @@
 
30
              << "\" - no data found." 
 
31
              << endl;
22
32
       }
23
33
     }
24
34
   }
25
35
-  sig_done.emit(name,count,sourcefile->GetVerificationPacket()->BlockCount()); 
26
 
+  sig_done.emit(name,count, sourcefile->GetVerificationPacket() ? sourcefile->GetVerificationPacket()->BlockCount() : 0); 
 
36
+  sig_done.emit(name,count, count>0 && sourcefile->GetVerificationPacket() ? sourcefile->GetVerificationPacket()->BlockCount() : 0); 
27
37
   sig_progress.emit(1000.0);
28
38
   return true;
29
39
 }
 
40
 
 
41
 // Find out how much data we have found
 
42
diff -aud -U 5 ../libpar2-0.2-original/par2repairer.h ../libpar2-0.2/par2repairer.h
 
43
--- ../libpar2-0.2-original/par2repairer.h      2006-01-20 00:38:27.000000000 +0100
 
44
+++ ../libpar2-0.2/par2repairer.h       2012-11-30 14:24:46.000000000 +0100
 
45
@@ -34,10 +34,15 @@
 
46
   sigc::signal<void, std::string> sig_filename;
 
47
   sigc::signal<void, double> sig_progress;
 
48
   sigc::signal<void, ParHeaders*> sig_headers;
 
49
   sigc::signal<void, std::string, int, int> sig_done;
 
50
 
 
51
+  // This method allows to determine whether libpar2 includes the patches
 
52
+  // ("libpar2-0.2-bugfixes.patch") submitted to libpar2 project.
 
53
+  // Use the method in configure scripts for detection.
 
54
+  void BugfixesPatchVersion2() { }
 
55
+
 
56
 protected:
 
57
   // Steps in verifying and repairing files:
 
58
 
 
59
   // Load packets from the specified file
 
60
   bool LoadPacketsFromFile(string filename);