[rkward/releases/0.6.5] /: Discard 0.6.4-2 debian package (never uploaded), and create 0.6.5-1, instead.

[Thomas Friedrichsmeier]

Git commit 26e997f2fd2af9925f75c38a30782e0308f12d1f by Thomas Friedrichsmeier.
Committed on 24/03/2016 at 20:52.
Pushed by tfry into branch 'releases/0.6.5'.

Discard 0.6.4-2 debian package (never uploaded), and create 0.6.5-1, instead.

- Back out the package split for the time being.

M  +2    -8    debian-official/changelog
M  +1    -16   debian-official/control
D  +0    -1    debian-official/rkward-data.install
D  +0    -1    debian-official/rkward-data.manpages
M  +1    -2    debian-official/rkward.install
M  +3    -3    debian-official/source/lintian-overrides
M  +1    -1    scripts/make_debian_package.sh

http://commits.kde.org/rkward/26e997f2fd2af9925f75c38a30782e0308f12d1f

diff --git a/debian-official/changelog b/debian-official/changelog
index 3e3a592..d8082e6 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -1,19 +1,13 @@
-rkward (0.6.4z+0.6.5+devel1-1) UNRELEASED; urgency=low
+rkward (0.6.5-1) unstable; urgency=low
   * new upstream release
-  * TODO: FIX changelog in case 0.6.4-2 never gets uploaded!!!!!!!!!!
-
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Wed, 10 Feb 2016 11:30:00 +0100
-
-rkward (0.6.4-2) unstable; urgency=low
   * bump standards version to 3.9.7 (no changes needed)
   * strip testing locale "x-test" from package
-  * split architecture independent files into new rkward-data package
   * add override for false-positive source-contains-prebuilt-javascript-object
     lintian warnings
   * make existing lintian overrides work with lintian 2.5.42
   * Adjust copyright file to changed filenames in rkward/qwinhost
 
- -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Mon, 07 Mar 2016 14:00:00 +0100
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Thu, 24 Mar 2016 20:00:00 +0100
 
 rkward (0.6.4-1) unstable; urgency=low
   * new upstream release
diff --git a/debian-official/control b/debian-official/control
index a89235b..9aaa137 100644
--- a/debian-official/control
+++ b/debian-official/control
@@ -14,7 +14,7 @@ Vcs-Git: git://anongit.kde.org/rkward.git
 
 Package: rkward
 Architecture: any
-Depends: rkward-data, ${misc:Depends}, ${rvers}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${rvers}, ${shlibs:Depends}
 Recommends: r-base-html
 Description: KDE frontend to the R statistics language
  RKWard aims to become an easy to use, transparent frontend to R,
@@ -22,18 +22,3 @@ Description: KDE frontend to the R statistics language
  Besides a convenient GUI for the most important statistical functions,
  future versions will also provide seamless integration with an
  office-suite.
-
-Package: rkward-data
-Architecture: all
-Depends: ${misc:Depends}
-Recommends: rkward
-Breaks: rkward (<< 0.6.4-2~)
-Replaces: rkward (<< 0.6.4-2~)
-Description: KDE frontend to the R statistics language
- RKWard aims to become an easy to use, transparent frontend to R,
- a powerful system for statistical computation and graphics.
- Besides a convenient GUI for the most important statistical functions,
- future versions will also provide seamless integration with an
- office-suite.
- .
- This package provides the architecture independent data files for rkward.
diff --git a/debian-official/rkward-data.install b/debian-official/rkward-data.install
deleted file mode 100644
index 1aa5c0e..0000000
--- a/debian-official/rkward-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/
diff --git a/debian-official/rkward-data.manpages b/debian-official/rkward-data.manpages
deleted file mode 100644
index 56c56af..0000000
--- a/debian-official/rkward-data.manpages
+++ /dev/null
@@ -1 +0,0 @@
-build/doc/rkward/rkward.1
diff --git a/debian-official/rkward.install b/debian-official/rkward.install
index e09844a..d7a0d79 100644
--- a/debian-official/rkward.install
+++ b/debian-official/rkward.install
@@ -1,2 +1 @@
-usr/bin/
-usr/lib/
\ No newline at end of file
+usr/
\ No newline at end of file
diff --git a/debian-official/source/lintian-overrides b/debian-official/source/lintian-overrides
index 058a0e4..3fc784b 100644
--- a/debian-official/source/lintian-overrides
+++ b/debian-official/source/lintian-overrides
@@ -1,4 +1,4 @@
 # Some of the plugin .js-files seem to generate false positives. Most of these _are_ primary sources, none of them are minified or post-processed in any other way.
-# A handful of .js-files _are_ generated (upstream, manually), indeed. These carry a corresponding notice, and their primary sources are included in rkward/plugins/rkwarddev_scripts .
-rkward source: source-contains-prebuilt-javascript-object rkward/plugins/*
-rkward source: source-is-missing rkward/plugins/*
+# A handful of .js-files _are_ generated (upstream, manually), indeed. These carry a corresponding notice, and their primary sources are included in rkward/plugins/rkwarddev_scripts.
+rkward source: source-contains-prebuilt-javascript-object rkward/plugins/*.js*
+rkward source: source-is-missing rkward/plugins/*.js*
diff --git a/scripts/make_debian_package.sh b/scripts/make_debian_package.sh
index 1a0ad28..5dca805 100755
--- a/scripts/make_debian_package.sh
+++ b/scripts/make_debian_package.sh
@@ -23,7 +23,7 @@ cd $DEBTEMPDIR
 tar -xzf rkward_$VERSION.orig.tar.gz
 cd rkward-$VERSION
 cp -a ${DEBDIR} debian
-dpkg-buildpackage -k0x1858CBB6 -rfakeroot
+dpkg-buildpackage -k0x1858CBB6 -rfakeroot --force-sign
 
 cd $DEBTEMPDIR
 dpkg-scansources . | bzip2 > Sources.bz2