Merge into trunk : packaging_review : Code : Notify OSD

Status:	Merged
Approved by:	Allan LeSage on 2013-05-02
Approved revision:	462
Merged at revision:	462
Proposed branch:	lp:~sil2100/notify-osd/packaging_review
Merge into:	lp:notify-osd
Diff against target:	150 lines (+57/-57) 4 files modified debian/changelog (+7/-0) debian/control (+10/-8) debian/copyright (+38/-49) debian/rules (+2/-0)
To merge this branch:	bzr merge lp:~sil2100/notify-osd/packaging_review
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-05-02
Ken VanDine		2013-05-01	Approve on 2013-05-01
Review via email: mp+161949@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-05-01:

#

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notify-osd-ci/1/rebuild

FAILED: Continuous integration, rev:462
http://jenkins.qa.ubuntu.com/job/notify-osd-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-raring-armhf-ci/1
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10486.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10487.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10488.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10690.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10691.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10692.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10693.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10694.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10932.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10933.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10934.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10935.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10936.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10937.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10938.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10939.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10940.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_10941.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_13648.html
    http://jenkins.qa.ubuntu.com/job/generic-coverity-check/15/artifact/results/coverity/CID_13649.html

Click here to trigger a rebuild:
http://s-jenkins:8080/job/notify-osd-ci/1/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) on 2013-05-01:

#

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-05-01:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-05-02:

#

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-05-02:

#

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/3/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-raring-amd64-autolanding/3
None: http://jenkins.qa.ubuntu.com/job/notify-osd-raring-armhf-autolanding/3/console

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-05-02:

#

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-05-02:

#

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/notify-osd-autolanding/4/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-raring-amd64-autolanding/4
SUCCESS: http://jenkins.qa.ubuntu.com/job/notify-osd-raring-armhf-autolanding/4

review: Needs Fixing (continuous-integration)

Revision history for this message

Allan LeSage (allanlesage) wrote on 2013-05-02:

#

I'm monitoring this, sorry for the mess :) .

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-05-02:

#

review: Approve (continuous-integration)

 === modified file 'debian/changelog'
 --- debian/changelog	2012-11-28 06:30:40 +0000
 +++ debian/changelog	2013-05-01 21:18:25 +0000
@@ -1,3 +1,10 @@
++notify-osd (0.9.35daily12.11.28-0ubuntu2) UNRELEASED; urgency=low
++
++  * debian/control, debian/copyright, debian/rules:
++    - Modifications related to compliance with our packaging standards
++
++ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>  Wed, 01 May 2013 22:57:49 +0200
++
  notify-osd (0.9.35daily12.11.28-0ubuntu1) raring; urgency=low
    [ Robert Bruce Park ]
 === modified file 'debian/control'
 --- debian/control	2012-11-26 20:17:09 +0000
 +++ debian/control	2013-05-01 21:18:25 +0000
@@ -15,18 +15,20 @@
  XS-Testsuite: autopkgtest
  Standards-Version: 3.9.2
  Homepage: https://launchpad.net/notify-osd
--# If you aren't a member of ~canonical-dx-team but need to upload packaging changes,
--# just go ahead.  ~canonical-dx-team will notice and sync up the code again.
--Vcs-Bzr: https://code.launchpad.net/~canonical-dx-team/notify-osd/precise
++# If you aren't a member of ~indicator-applet-developers but need to upload
++# packaging changes, just go ahead. ~indicator-applet-developers will notice
++# and sync up the code again.
++Vcs-Bzr: https://code.launchpad.net/~indicator-applet-developers/notify-osd/trunk
++Vcs-Browser: https://bazaar.launchpad.net/~indicator-applet-developers/notify-osd/trunk/files
  Package: notify-osd
  Architecture: any
--Depends: ${misc:Depends},
++Depends: gsettings-desktop-schemas,
++         ${misc:Depends},
           ${shlibs:Depends},
--         gsettings-desktop-schemas,
--Recommends: notify-osd-icons
--Provides: notification-daemon
--Replaces: notification-daemon
++Recommends: notify-osd-icons,
++Provides: notification-daemon,
++Replaces: notification-daemon,
  Description: daemon that displays passive pop-up notifications
   The Desktop Notifications framework provides a standard way of doing
   passive pop-up notifications on the Linux desktop.  These are
 === modified file 'debian/copyright'
 --- debian/copyright	2012-11-22 21:11:36 +0000
 +++ debian/copyright	2013-05-01 21:18:25 +0000
@@ -1,49 +1,38 @@
--This package was debianized by David Barth <david.barth@canonical.com> on
--Wed Dec  3 18:04:59 PST 2008
--
--It was downloaded from https://launchpad.net/notify-osd
--
--Copyright (C) Canonical, Oct. 2008
--
--egg/* is Copyright (C) 2006, 2007 OpenedHand
--
--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, version 3 of the License.
--
--  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 St, 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-3'.
--
--License for egg/*:
--
--  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 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 Library 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
--
--On Debian systems, the complete text of the GNU Lesser General
--Public License can be found in `/usr/share/common-licenses/LGPL-2'.
--
--The Debian packaging is (C) 2009, Canonical Ltd. and
--is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'.
++Format: http://dep.debian.net/deps/dep5/
++Upstream-Name: notify-osd
++Upstream-Contact: Mirco Mueller <mirco.mueller@canonical.com>
++Source: https://launchpad.net/notify-osd
++
++Files: *
++Copyright: 2011 Canonical Ltd
++License: GPL-3.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, version 3 of the License.
++ .
++ This package 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, see <http://www.gnu.org/licenses/>.
++ .
++ On Debian systems, the complete text of the GNU General
++ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
++
++Files: egg/*
++Copyright: 2006, 2007 OpenedHand
++License: LGPL-2+
++ 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 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.
++ .
++ On Debian systems, the complete text of the GNU Lesser General Public
++ Licence can be found in `/usr/share/common-licenses/LGPL-2'
 === modified file 'debian/rules'
 --- debian/rules	2012-11-26 20:17:09 +0000
 +++ debian/rules	2013-05-01 21:18:25 +0000
@@ -1,5 +1,7 @@
  #!/usr/bin/make -f
++export DPKG_GENSYMBOLS_CHECK_LEVEL=4
++
  %:
  	dh $@ --with autoreconf

Notify OSD

Merge lp:~sil2100/notify-osd/packaging_review into lp:notify-osd

Commit message

Description of the change

Preview Diff

Subscribers