[bollin] r5492 committed - * New upstream release....

2 views
Skip to first unread message

bol...@googlecode.com

unread,
Aug 1, 2014, 1:14:50 PM8/1/14
to debian...@googlegroups.com
Revision: 5492
Author: sylvestre.ledru
Date: Fri Aug 1 17:14:30 2014 UTC
Log: * New upstream release.
* debian/control
+ Add myself as uploader
+ Change debhelper to 9 in B-D.
+ Remove cdbs in B-D
+ Add dh-autoreconf and libgconf2-dev in B-D
+ Bump Standards-Version 3.9.5
+ Update to DEP5 copyright format 1.0
* Switch compat level 5 to 9
* debian/rules
+ Add hardening flags
* Update watch file
* debian/patches
+ Patch restore-orig-size.patch removed because isn't applied
+ Patch overlap-screen-dual-screen.patch because isn't applied
+ Patch fix-mouse-scrolling-in-less-on-Ubuntu.patch because isn't applied
+ Add description for guake.desktop.patch and refresh patch
+ Add fix_manpage.diff to fix lintian warning
+ Add fix_shebang.diff to fix to avoid lintian warning
* Rename docs file to guake.docs
+ Remove TODO file
* Rename postinst script to guake.postinst
* Rename prerm script to guake.prerm
http://code.google.com/p/bollin/source/detail?r=5492

Added:
/guake/trunk/debian/guake.docs
/guake/trunk/debian/guake.postinst
/guake/trunk/debian/guake.prerm
/guake/trunk/debian/patches/fix_manpage.diff
/guake/trunk/debian/patches/fix_shebang.diff
Modified:
/guake/trunk/debian/changelog
/guake/trunk/debian/compat
/guake/trunk/debian/control
/guake/trunk/debian/copyright
/guake/trunk/debian/patches/guake.desktop.patch
/guake/trunk/debian/patches/series
/guake/trunk/debian/rules
/guake/trunk/debian/watch

=======================================
--- /dev/null
+++ /guake/trunk/debian/guake.docs Fri Aug 1 17:14:30 2014 UTC
@@ -0,0 +1,2 @@
+NEWS
+README.rst
=======================================
--- /dev/null
+++ /guake/trunk/debian/guake.postinst Fri Aug 1 17:14:30 2014 UTC
@@ -0,0 +1,20 @@
+#!/bin/sh
+# postinst script for guake
+#
+set -e
+case "$1" in
+ configure)
+ gconf-schemas --register /usr/share/gconf/schemas/guake.schemas >
/dev/null
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
=======================================
--- /dev/null
+++ /guake/trunk/debian/guake.prerm Fri Aug 1 17:14:30 2014 UTC
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -e
+
+case "$1" in
+ remove|deconfigure)
+ gconf-schemas --unregister guake.schemas
+ ;;
+
+
+ upgrade|purge)
+
+ ;;
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+esac
+
+#DEBHELPER#
=======================================
--- /dev/null
+++ /guake/trunk/debian/patches/fix_manpage.diff Fri Aug 1 17:14:30 2014
UTC
@@ -0,0 +1,14 @@
+Description: Fix lintian warning in manpage
+Author: Daniel Echeverry <epsi...@gmail.com>
+Last-Update: 2014-07-29
+--- a/data/guake.1
++++ b/data/guake.1
+@@ -3,7 +3,7 @@
+ guake \(em A drop-down terminal for GNOME environment.
+ .SH "SYNOPSIS"
+ .PP
+-\fBguake\fR [\fB-h, \-\-help\fR\fP] [\fB-s, --show-hide\fR\fP] [\fB-p,
--preferences\fR\fP] [\fB-a, --about\fR\fP] [\fB-q, --quit\fR\fP]
++\fBguake\fR [\fB-h, \-\-help\fR\fP] [\fB-s, \-\-show-hide\fR\fP] [\fB-p,
\-\-preferences\fR\fP] [\fB-a, \-\-about\fR\fP] [\fB-q, \-\-quit\fR\fP]
+ .SH "DESCRIPTION"
+ .PP
+ Guake is a drop-down terminal for GNOME and any other desktop.
=======================================
--- /dev/null
+++ /guake/trunk/debian/patches/fix_shebang.diff Fri Aug 1 17:14:30 2014
UTC
@@ -0,0 +1,11 @@
+Description: Fix python shebang line to avoid lintian warning
+Author: Daniel Echeverry <epsi...@gmail.com>
+Last-Update: 2013-12-27
+--- a/src/guake
++++ b/src/guake
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/python2.7
+ # -*- coding: utf-8; -*-
+ """
+ Copyright (C) 2007-2012 Lincoln de Sousa <lin...@minaslivre.org>
=======================================
--- /guake/trunk/debian/changelog Thu Jul 24 16:19:00 2014 UTC
+++ /guake/trunk/debian/changelog Fri Aug 1 17:14:30 2014 UTC
@@ -1,10 +1,30 @@
-guake (0.5.0~rc1-1~exp1) UNRELEASED; urgency=medium
+guake (0.5.0~rc1-1) unstable; urgency=low

- * New snapshot release (Closes: #721554)
- * Standards-Version updated to 3.9.5
- * Update of the homepage (LP: #1347977)
+ * New upstream release.
+ * debian/control
+ + Add myself as uploader
+ + Change debhelper to 9 in B-D.
+ + Remove cdbs in B-D
+ + Add dh-autoreconf and libgconf2-dev in B-D
+ + Bump Standards-Version 3.9.5
+ + Update to DEP5 copyright format 1.0
+ * Switch compat level 5 to 9
+ * debian/rules
+ + Add hardening flags
+ * Update watch file
+ * debian/patches
+ + Patch restore-orig-size.patch removed because isn't applied
+ + Patch overlap-screen-dual-screen.patch because isn't applied
+ + Patch fix-mouse-scrolling-in-less-on-Ubuntu.patch because isn't
applied
+ + Add description for guake.desktop.patch and refresh patch
+ + Add fix_manpage.diff to fix lintian warning
+ + Add fix_shebang.diff to fix to avoid lintian warning
+ * Rename docs file to guake.docs
+ + Remove TODO file
+ * Rename postinst script to guake.postinst
+ * Rename prerm script to guake.prerm

- -- Sylvestre Ledru <sylv...@debian.org> Thu, 24 Jul 2014 17:57:24 +0200
+ -- Daniel Echeverry <epsi...@gmail.com> Thu, 24 Jul 2014 20:31:20 -0500

guake (0.4.4-1) unstable; urgency=low

=======================================
--- /guake/trunk/debian/compat Sat May 31 22:17:03 2008 UTC
+++ /guake/trunk/debian/compat Fri Aug 1 17:14:30 2014 UTC
@@ -1,1 +1,1 @@
-5
+9
=======================================
--- /guake/trunk/debian/control Thu Jul 24 16:19:00 2014 UTC
+++ /guake/trunk/debian/control Fri Aug 1 17:14:30 2014 UTC
@@ -2,21 +2,22 @@
Section: x11
Priority: optional
Maintainer: Sylvestre Ledru <sylv...@debian.org>
-Build-Depends: debhelper (>= 5), python, cdbs, autoconf,
libxml-parser-perl,
+Uploaders: Daniel Echeverry <epsi...@gmail.com>
+Build-Depends: debhelper (>= 9), python, autoconf, libxml-parser-perl,
pkg-config, libgtk2.0-dev, gconf2, python-dev, intltool, python-gtk2-dev,
- python-vte, python-gnome2, python-xdg, gnome-common
+ python-vte, python-gnome2, python-xdg, dh-autoreconf, libgconf2-dev
X-Python-Version: 2.7
Standards-Version: 3.9.5
-Homepage: https://github.com/Guake/guake
+Homepage: http://www.guake.org
Vcs-Svn: https://bollin.googlecode.com/svn/guake/trunk
Vcs-Browser: http://bollin.googlecode.com/svn/guake/trunk

Package: guake
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, notification-daemon,
+Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
notification-daemon,
python-notify, python, libgtk2.0-0, gconf2, python-vte, python-dbus,
- python-glade2, python-gconf, python-xdg, ${python:Depends}
-Provides: x-terminal-emulator, ${python:Provides}
+ python-glade2, python-gconf, python-xdg
+Provides: x-terminal-emulator
Description: Drop-down terminal for GNOME Desktop Environment
Guake is a drop-down terminal for GNOME Desktop Environment, so you just
need to press a key to invoke him, and press again to hide.
=======================================
--- /guake/trunk/debian/copyright Sat Aug 9 23:26:56 2008 UTC
+++ /guake/trunk/debian/copyright Fri Aug 1 17:14:30 2014 UTC
@@ -1,91 +1,58 @@
-This package was debianized by Sylvestre Ledru <sylvest...@inria.fr>
on
-Sat, 17 May 2008 16:04:07 +0200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: guake
+Source: http://www.guake.org

-It was downloaded from <http://guake-terminal.org/>
+Files: *
+Copyright: 2007-2013 Lincoln de Sousa <lin...@guake.org>
+ 2007 Gabriel Falcão <gab...@guake-terminal.org>
+ 2010-2013 Aleksandar Krsteski <aleks...@guake.org>
+ 2007-2013 Pierre-Yves Chibon (pingou) <pin...@guake.org>
+ 2010-2013 Max Ulidtko <uli...@gmail.com>
+ 2014 Gaetan Semet <gae...@xeberon.net>
+License: GPL-2.0+

-Upstream Authors:
+Files: src/simplegladeapp.py
+Copyright: 2004 Sandino Flores Moreno
+License: LGPL-2.1+

- Gabriel Falcao <gab...@guake-terminal.org>
- Lincoln de Sousa <lin...@guake-terminal.org>
+Files: debian/*
+Copyright: 2008-2013 Sylvestre Ledru <sylvest...@inria.fr>
+ 2014 Daniel Echeverry <epsi...@gmail.com>
+License: GPL-2.0+

-Copyright (C) 2007-2008 Sandino Flores Moreno
-Copyright (C) 2007-2008 Lincoln de Sousa
+License: GPL-2.0+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.

-License:
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-
-Please see `/usr/share/common-licenses/GPL-2' for the full text of the
-license.
-
-
-src/simplegladeapp.py:
-
-Copyright (C) 2004 Sandino Flores Moreno
-
-License:
- LGPL
-
-
-src/globalhotkeys/eggaccelerators.h:
-src/eggcellrendererkeys/eggaccelerators.h:
-
-Copyright (C) 2002 Red Hat, Inc.
-
-License:
- LGPL
-
-
-src/globalhotkeys/eggaccelerators.c:
-src/eggcellrendererkeys/eggaccelerators.c
-
-Copyright (C) 2002 Red Hat, Inc.; Copyright 1998, 2001 Tim Janik
-
-License:
- LGPL
-
-
-src/eggcellrendererkeys/eggcellrendererkeys.h:
-
-Copyright (C) 2000 Red Hat, Inc., Jonathan Blandford <j...@redhat.com>
-
-License:
- LGPL
-
-
-The LGPL license:
-
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of the
- License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
-
-Please see `/usr/share/common-licenses/LGPL-2.1' for the full text of
-the license.
-
-The Debian packaging is (C) 2008, Sylvestre Ledru
<sylv...@ecranbleu.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of the
+ License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA
+ .
+ Please see `/usr/share/common-licenses/LGPL-2.1' for the full text of
+ the license.
=======================================
--- /guake/trunk/debian/patches/guake.desktop.patch Sun Aug 31 21:06:23
2008 UTC
+++ /guake/trunk/debian/patches/guake.desktop.patch Fri Aug 1 17:14:30
2014 UTC
@@ -1,8 +1,29 @@
---- guake-0.3.orig/data/guake.desktop.in 2008-08-16 14:53:34.000000000
+0200
-+++ guake-0.3/data/guake.desktop.in 2008-08-16 14:53:50.000000000 +0200
+Description: Remove Encoding Field in desktop files
+Author: Sylvestre Ledru <sylv...@debian.org>
+Last-Update: 2011-06-28
+--- a/data/guake.desktop.in
++++ b/data/guake.desktop.in
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Name=Guake Terminal
Name[pt]=Guake Terminal
Name[pt_BR]=Guake Terminal
+@@ -16,3 +15,4 @@ Icon=guake
+ Type=Application
+ Categories=GNOME;GTK;System;Utility;TerminalEmulator;
+ StartupNotify=true
++Keywords=Terminal;Utility;
+--- a/data/guake-prefs.desktop.in
++++ b/data/guake-prefs.desktop.in
+@@ -1,5 +1,4 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Guake Preferences
+ Name[pt_BR]=Preferências do Guake
+ Comment=Configure your Guake sessions
+@@ -13,3 +12,4 @@ Type=Application
+ StartupNotify=true
+ Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;
+ X-Desktop-File-Install-Version=0.15
++Keywords=Terminal;Utility;
=======================================
--- /guake/trunk/debian/patches/series Mon Jul 30 15:58:54 2012 UTC
+++ /guake/trunk/debian/patches/series Fri Aug 1 17:14:30 2014 UTC
@@ -1,1 +1,3 @@
+fix_manpage.diff
guake.desktop.patch
+fix_shebang.diff
=======================================
--- /guake/trunk/debian/rules Thu Jul 24 16:19:00 2014 UTC
+++ /guake/trunk/debian/rules Fri Aug 1 17:14:30 2014 UTC
@@ -1,15 +1,29 @@
#!/usr/bin/make -f
-# Copyright 2008 - Sylvestre Ledru <sylvest...@inria.fr>
+#export DH_VERBOSE=1

-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+CFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS+=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)

-debian/stamp-autotools-files:
- sh autogen.sh

-install/guake::
- mkdir -p debian/guake/usr/share/
- mv debian/guake/etc/gconf/ debian/guake/usr/share/
- dh_python2 -pguake
- find debian/$(cdbs_curpkg) -name \*.la -exec rm -f {} \;
- find debian/$(cdbs_curpkg) -name \*.a -exec rm -f {} \;
+%:
+ dh $@ --with autoreconf,python2
+
+override_dh_clean:
+ dh_clean
+ find . -name \*.la -exec rm -f {} \;
+ find . -name \*.a -exec rm -f {} \;
+
+override_dh_auto_configure:
+ intltoolize
+ dh_auto_configure
+
+
+override_dh_auto_build:
+ dh_auto_build -- CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+
+override_dh_install:
+ find $(CURDIR)/ -name "*.la" -exec \
+ sed -i -e "s,^dependency_libs=.*,dependency_libs=''," {} +
+ dh_install
=======================================
--- /guake/trunk/debian/watch Thu Jul 24 16:19:00 2014 UTC
+++ /guake/trunk/debian/watch Fri Aug 1 17:14:30 2014 UTC
@@ -1,3 +1,3 @@
version=3
-opts="filenamemangle=s/(?:.*)?v?(\d[\d\.]*)\.tar\.gz/guake-$1.tar.gz/" \
- https://github.com/guake/guake/tags (?:.*/)?v?(\d[\d\.rc-]*)\.tar\.gz
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|
alpha)\d*)$/$1~$2/,filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/guake-$1\.tar\.gz/
\
+ http://github.com/Guake/guake/releases/ .*/archive/(\d.*)\.tar\.gz
Reply all
Reply to author
Forward
0 new messages