summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/README.source18
-rw-r--r--debian/changelog12
-rw-r--r--debian/control6
-rw-r--r--debian/copyright4
-rw-r--r--debian/files1
-rw-r--r--debian/patches/0001-user_guide.patch4
6 files changed, 37 insertions, 8 deletions
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..e4f2b3d
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 02 Jun 2017 19:00:40 +0200
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
diff --git a/debian/changelog b/debian/changelog
index ec9379d..1d69496 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+scons-doc (3.0.0+repack-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ - Refresh patches:
+ + patches/0001-user_guide.patch.
+ * New README.source to explain the branching model used.
+ * Declare compliance with Debian Policy 4.1.0. (No changes needed).
+ * debian/copyright:
+ - Add year 2017.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 28 Sep 2017 12:19:45 +0200
+
scons-doc (2.5.1+repack-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 37343f1..bd0f649 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
Uploaders: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Build-Depends:
debhelper (>= 10),
- scons (>= 2.5)
+ scons (>= 3.0)
Build-Depends-Indep:
openjdk-8-jre,
docbook-utils,
@@ -13,7 +13,7 @@ Build-Depends-Indep:
fop,
python-libxml2,
python-libxslt1
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
Homepage: https://www.scons.org/
Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/scons-doc.git
Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/scons-doc.git
@@ -21,7 +21,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/scons-doc.git
Package: scons-doc
Architecture: all
Depends: ${misc:Depends}
-Suggests: scons (>= 2.5)
+Suggests: scons (>= 3.0)
Description: Documentation for SCons, a replacement for Make
SCons is a make replacement providing a range of enhanced features such
as automated dependency generation and built in compilation cache
diff --git a/debian/copyright b/debian/copyright
index 1541ac5..e964123 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -18,7 +18,7 @@ Files-Excluded: HOWTO
runtest.py
Files: *
-Copyright: 2001-2016 The SCons Foundation
+Copyright: 2001-2017 The SCons Foundation
1999-2006 Gregory P. Ward
2001-2003 Steven Knight
2001-2004 Twisted Matrix Laboratories
@@ -31,7 +31,7 @@ Files: doc/user/titlepage/SConsBuildBricks_path.svg
doc/design/titlepage/SConsBuildBricks_path.svg
doc/man/titlepage/SConsBuildBricks_path.svg
doc/reference/titlepage/SConsBuildBricks_path.svg
-Copyright: 2001-2016 The SCons Foundation
+Copyright: 2001-2017 The SCons Foundation
1999-2006 Gregory P. Ward
2001-2003 Steven Knight
2001-2004 Twisted Matrix Laboratories
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 58c551f..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-scons-doc_2.5.1+repack-1_source.buildinfo doc optional
diff --git a/debian/patches/0001-user_guide.patch b/debian/patches/0001-user_guide.patch
index 4d608d1..88a718a 100644
--- a/debian/patches/0001-user_guide.patch
+++ b/debian/patches/0001-user_guide.patch
@@ -8,7 +8,7 @@ Index: trunk/doc/SConscript
===================================================================
--- trunk.orig/doc/SConscript
+++ trunk/doc/SConscript
-@@ -308,12 +308,12 @@ else:
+@@ -311,12 +311,12 @@ else:
DOCTARGETS = 0
DOCDEPENDS = 1
DOCNODES = 2
@@ -22,5 +22,5 @@ Index: trunk/doc/SConscript
- 'man' : (['man','epub','text'], [], [])
+ #'man' : (['man','epub','text'], [], [])
}
-
+
#