From 44732d24eb3ebc88672de7b8b294b2b5aad0a230 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 15 Feb 2015 20:29:25 +0100 Subject: [PATCH] new release (dunno which number it will have right now, i guess 0.2.0) packages renamed debian $foo fixed source/options added --- .gitignore | 2 +- COPYING | 10 +++++----- debian/changelog | 13 ++----------- debian/control | 24 +++++++++++++++++------- debian/copyright | 4 ++-- debian/lintian-overrides | 2 +- debian/rules | 3 +-- debian/source/options | 2 ++ 8 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 debian/source/options diff --git a/.gitignore b/.gitignore index 378eac2..ee4c926 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -build +/test diff --git a/COPYING b/COPYING index d60c31a..e90dfed 100644 --- a/COPYING +++ b/COPYING @@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest diff --git a/debian/changelog b/debian/changelog index badda2a..f14b347 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,5 @@ -obconf-qt (0.1.0-2) unstable; urgency=medium - - * drop debug package - * Min Qt version 5.3.2 - * bump standards to 3.9.6 - * lintian-override for missing manpage added - - -- Alf Gaida Sun, 19 Oct 2014 21:22:05 +0200 - -obconf-qt (0.1.0-1) unstable; urgency=low +obconf-qt (0.2.0-1) experimental; urgency=low * Initial release (Closes: #761263) - -- Alf Gaida Mon, 24 Feb 2014 23:41:30 +0100 + -- Alf Gaida Sun, 15 Feb 2015 19:30:56 +0100 diff --git a/debian/control b/debian/control index aaa3dc2..4e9b09c 100644 --- a/debian/control +++ b/debian/control @@ -1,9 +1,11 @@ Source: obconf-qt Section: utils Priority: optional -Maintainer: Alf Gaida +Maintainer: Debian LXQt Maintainers +Uploaders: + Alf Gaida Build-Depends: - cmake, + cmake (>= 3.0.2), debhelper (>= 9), openbox-dev, pkg-config, @@ -15,12 +17,10 @@ Homepage: https://github.com/lxde/obconf-qt #Vcs-Git: git://anonscm.debian.org/collab-maint/obconf-qt.git #Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/obconf-qt.git;a=summary -Package: obconf-qt5 +Package: obconf-qt Architecture: any -Breaks: - obconf-qt, -Replaces: - obconf-qt, +Breaks: obconf-qt5 (<< 0.2.0) +Replaces: obconf-qt5 (<< 0.2.0) Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -28,3 +28,13 @@ Description: Openbox configuration with a Qt interface obconf-qt is an utility to configure openbox with a Qt interface. . This package contain the application files. + +# ---- to be removed in 2016 ---- + +Package: obconf-qt5 +Depends: obconf-qt, ${misc:Depends} +Priority: extra +Section: oldlibs +Architecture: all +Description: obconf-qt transitional package + Empty package to facilitate upgrades, can be safely removed. diff --git a/debian/copyright b/debian/copyright index 01d9b4c..57896cf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,11 +3,11 @@ Upstream-Name: obconf-qt Source: https://github.com/lxde/obconf-qt Files: * -Copyright: 2012-2014 LXQt team +Copyright: 2012-2015 LXQt team License: GPL-2.0+ and LGPL-2.1+ Files: debian/* -Copyright: 2013-2014 Alf Gaida +Copyright: 2013-2015 Alf Gaida License: LGPL-2.1+ License: GPL-2.0+ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 50816f8..b68d603 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,3 +1,3 @@ # there will be no manpage in a foreseable future -obconf-qt5: binary-without-manpage usr/bin/obconf-qt +obconf-qt: binary-without-manpage usr/bin/obconf-qt diff --git a/debian/rules b/debian/rules index 3d26250..314c462 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,4 @@ #!/usr/bin/make -f - #export DH_VERBOSE=1 export USE_QT5=1 @@ -9,4 +8,4 @@ export USE_QT5=1 override_dh_auto_install: - dh_auto_install -- DESTDIR=$(CURDIR)/debian/obconf-qt5 + dh_auto_install -- DESTDIR=$(CURDIR)/debian/obconf-qt diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..be5dabe --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +tar-ignore=.gitignore +