← Back to branch summary

~larry-e-works/uci-engine/amqp-to-kombu

« back to all changes in this revision

Viewing changes to cupstream2distro/tests/data/results/foo_package_foo_package_with_upstream_and_packaging_changes.diff

  • Committer: Francis Ginther
  • Date: 2014-06-10 20:42:46 UTC
  • mto: This revision was merged to the branch mainline in revision 571.
  • Revision ID: francis.ginther@canonical.com-20140610204246-b1bsrik7nlcolqy7
Import lp:cupstream2distro rev 605.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cupstream2distro/tests/data/results/foo_package_foo_package_with_upstream_and_packaging_changes.diff
 
1
/!\ Remember that this diff only represents packaging changes and build tools diff, not the whole content diff!
 
2
 
 
3
--- foo-42.0daily83.09.13.2/CMakeLists.txt
 
4
+++ foo-42.0+13.10.20130709/CMakeLists.txt
 
5
@@ -1,3 +1,4 @@
 
6
 Fake cmakerie on root dir
 
7
 
 
8
 Change here
 
9
+Also one here
 
10
--- foo-42.0daily83.09.13.2/configure.ac
 
11
+++ foo-42.0+13.10.20130709/configure.ac
 
12
@@ -1,3 +1,4 @@
 
13
 Fake configure.ac
 
14
 
 
15
 Change here
 
16
+Another change here
 
17
--- foo-42.0daily83.09.13.2/debian/changelog
 
18
+++ foo-42.0+13.10.20130709/debian/changelog
 
19
@@ -1,3 +1,10 @@
 
20
+foo (42.0+13.10.20130709-0ubuntu1) saucy; urgency=low
 
21
+
 
22
+  * New upstream changelog with changes
 
23
+  * Automatic snapshot from revision 12
 
24
+
 
25
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 09 Jul 2013 14:15:57 +0200
 
26
+
 
27
 foo (42.0daily83.09.13.2-0ubuntu1) raring; urgency=low
 
28
 
 
29
   * Automatic snapshot from revision 10
 
30
--- foo-42.0daily83.09.13.2/debian/control
 
31
+++ foo-42.0+13.10.20130709/debian/control
 
32
@@ -16,5 +16,6 @@
 
33
 Depends: ${shlibs:Depends},
 
34
          ${misc:Depends},
 
35
          ${python:Depends},
 
36
+Replaces: bar,
 
37
 Description: The amazing foo package, without any trace of bar
 
38
  Baz as well is excluded from the foo package.
 
39
--- foo-42.0daily83.09.13.2/debian/subdir/subpackagefile
 
40
+++ foo-42.0+13.10.20130709/debian/subdir/subpackagefile
 
41
@@ -0,0 +1 @@
 
42
+Package content
 
43
--- foo-42.0daily83.09.13.2/setup.py
 
44
+++ foo-42.0+13.10.20130709/setup.py
 
45
@@ -1,3 +1,4 @@
 
46
 Fake setup
 
47
 
 
48
 Change here
 
49
+Python is my passion
 
50
--- foo-42.0daily83.09.13.2/src/CMakeLists.txt
 
51
+++ foo-42.0+13.10.20130709/src/CMakeLists.txt
 
52
@@ -1,3 +1,4 @@
 
53
 Fake cmakerie on src dir
 
54
 
 
55
 Change here
 
56
+Changes in subdir
 
57
--- foo-42.0daily83.09.13.2/src/Makefile.am
 
58
+++ foo-42.0+13.10.20130709/src/Makefile.am
 
59
@@ -1,3 +1,4 @@
 
60
 Fake Makefile in src
 
61
 
 
62
 Change here
 
63
+Change in subdir
 
64