From 08cccd439fee1aa42a2ae3ad17d0fbf3c89fcbcf Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 13 Dec 2017 20:08:09 +0100 Subject: [PATCH] Some cleanup * Bumped Standards to 4.1.2, no changes needed * Removed branch from VCS fields * Removed debian/gbp.conf * Removed trailing whitespaces --- debian/changelog | 9 +++++++++ debian/control | 6 +++--- debian/copyright | 16 ++++++++-------- debian/gbp.conf | 8 -------- 4 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 debian/gbp.conf diff --git a/debian/changelog b/debian/changelog index b232f11..99efd74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libfm-qt (0.12.0-14) unstable; urgency=medium + + * Bumped Standards to 4.1.2, no changes needed + * Removed branch from VCS fields + * Removed debian/gbp.conf + * Removed trailing whitespaces + + -- Alf Gaida Wed, 13 Dec 2017 20:08:02 +0100 + libfm-qt (0.12.0-13) unstable; urgency=medium * Transition to unstable diff --git a/debian/control b/debian/control index 12eb650..0dfd31a 100644 --- a/debian/control +++ b/debian/control @@ -17,9 +17,9 @@ Build-Depends: debhelper (>= 10), libx11-dev, lxqt-build-tools (>= 0.4.0), qtbase5-private-dev -Standards-Version: 4.1.1 -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/libfm-qt.git/?h=debian/sid -Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/libfm-qt.git -b debian/sid +Standards-Version: 4.1.2 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/libfm-qt.git +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/libfm-qt.git Homepage: https://github.com/lxde/libfm-qt Package: libfm-qt3 diff --git a/debian/copyright b/debian/copyright index c1347bf..e449dcf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -34,15 +34,15 @@ License: BSD-3-Clause without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. License: LGPL-2.1+ diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 7a9f00a..0000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,8 +0,0 @@ -[DEFAULT] -debian-branch = debian/sid -upstream-branch = upstream/latest -pristine-tar = True - -[import-orig] -# Use git cherrypick -n upstream instead. -merge = False