Merge lp:~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814 into lp:ubuntu/maverick/libsmbios

Proposed by James Westby
Status: Rejected
Rejected by: James Westby
Proposed branch: lp:~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814
Merge into: lp:ubuntu/maverick/libsmbios
Diff against target: 45 lines (+38/-0) (has conflicts)
1 file modified
debian/README.source (+38/-0)
Conflict adding file debian/README.source.  Moved existing file to debian/README.source.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/maverick/libsmbios now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/libsmbios/maverick-201007211814. A merge should be performed if necessary.

To post a comment you must log in.

Unmerged revisions

17. By Stefano Rivera

* New upstream release (LP: #591017).
* debian/patches/gcc44.dpatch:
  - Dropped, fixed upstream.
* debian/patches/fix-typo.dpatch:
  - Dropped, fixed upstream.
* debian/control:
  - Bump Standards-Version to 3.9.0.
* debian/README.source:
  - Fix lintian's warning patch-system-but-no-source-readme.
* debian/watch:
  - Find tarballs, not directories.
* Call dh_python2.
* Revert:
  - Enable building on lpia (Closes: #488278)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/README.source'
2--- debian/README.source 1970-01-01 00:00:00 +0000
3+++ debian/README.source 2010-07-21 18:19:44 +0000
4@@ -0,0 +1,38 @@
5+This package uses dpatch to manage all modifications to the upstream
6+source. Changes are stored in the source package as diffs in
7+debian/patches and applied during the build.
8+
9+To get the fully patched source after unpacking the source package, cd
10+to the root level of the source package and run:
11+
12+ debian/rules patch
13+
14+Removing a patch is as simple as removing its entry from the
15+debian/patches/00list file, and please also remove the patch file
16+itself.
17+
18+Creating a new patch is done with "dpatch-edit-patch patch XX_patchname"
19+where you should replace XX with a new number and patchname with a
20+descriptive shortname of the patch. You can then simply edit all the
21+files your patch wants to edit, and then simply "exit 0" from the shell
22+to actually create the patch file.
23+
24+To tweak an already existing patch, call "dpatch-edit-patch XX_patchname"
25+and replace XX_patchname with the actual filename from debian/patches
26+you want to use.
27+
28+To clean up afterwards again, "debian/rules unpatch" will do the
29+work for you - or you can of course choose to call
30+"fakeroot debian/rules clean" all together.
31+
32+
33+---
34+
35+this documentation is part of dpatch package, and may be used by
36+packages using dpatch to comply with policy on README.source. This
37+documentation is meant to be useful to users who are not proficient in
38+dpatch in doing work with dpatch-based packages. Please send any
39+improvements to the BTS of dpatch package.
40+
41+original text by Gerfried Fuchs, edited by Junichi Uekawa <dancer@debian.org>
42+10 Aug 2008.
43
44=== renamed file 'debian/README.source' => 'debian/README.source.moved'
45=== modified file 'debian/patches/amlcmessages.dpatch' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches

to all changes: