diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 16:08:29 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 16:08:29 +0200 |
| commit | 56df23e59e81646d5f2ba09a0aa5a40163dba992 (patch) | |
| tree | 4362c98b4a5c55818dcd880249b5dfa3ce5432a0 | |
| parent | 374b1f7583ad25bca0b801dd046ce8bfebd53bb0 (diff) | |
merge brocken gbp import-orig part 2
| -rw-r--r-- | README.rst | 15 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 2 insertions, 17 deletions
@@ -480,16 +480,6 @@ following packages will be built:: build/dist/scons-2.3.3-1.noarch.rpm build/dist/scons-2.3.3-1.src.rpm build/dist/scons-2.3.3.linux-i686.tar.gz -<<<<<<< HEAD - build/dist/scons-2.3.5.tar.gz - build/dist/scons-2.3.5.win32.exe - build/dist/scons-2.3.5.zip - build/dist/scons-doc-2.3.5.tar.gz - build/dist/scons-local-2.3.5.tar.gz - build/dist/scons-local-2.3.5.zip - build/dist/scons-src-2.3.5.tar.gz - build/dist/scons-src-2.3.5.zip -======= build/dist/scons-2.3.6.tar.gz build/dist/scons-2.3.6.win32.exe build/dist/scons-2.3.6.zip @@ -498,7 +488,6 @@ following packages will be built:: build/dist/scons-local-2.3.6.zip build/dist/scons-src-2.3.6.tar.gz build/dist/scons-src-2.3.6.zip ->>>>>>> upstream/2.3.6 build/dist/scons_2.3.3-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build @@ -761,7 +750,3 @@ many contributors, including but not at all limited to: Copyright (c) 2001 - 2015 The SCons Foundation -<<<<<<< HEAD - -======= ->>>>>>> upstream/2.3.6 diff --git a/debian/changelog b/debian/changelog index cc82ca6..e950092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -scons-doc (2.3.5+repack-1) UNRELEASED; urgency=medium +scons-doc (2.3.6+repack-1) unstable; urgency=medium * New upstream release. * Refresh patches. @@ -9,7 +9,7 @@ scons-doc (2.3.5+repack-1) UNRELEASED; urgency=medium * Rename source to +repack. * Add README.rst to debian/docs. - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 15 Jun 2015 19:22:32 +0200 + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 02 Aug 2015 12:14:02 +0200 scons-doc (2.3.4-1) unstable; urgency=low |