[SCM] oxygen-gtk3 packaging branch, master, updated. 930bfa2d714dc433b706aaa7816bd56a3f846d8a

Mon May 21 17:28:44 UTC 2012

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/oxygen-gtk3.git;a=commitdiff;h=d553f15

The following commit has been merged in the master branch:
commit d553f155e74155692d2579f29a65c7bd820b9cab
Author: Philip Muskovac <yofel at gmx.net>
Date:   Mon May 21 19:19:39 2012 +0200

    update package to 1.0.4 release and add packaging improvements from Dmitry Smirnov
---
 debian/changelog |    4 +-
 debian/control   |    3 +-
 debian/copyright |   76 +++++++++++++++++++++++++----------------------------
 debian/rules     |   10 +++----
 debian/watch     |    2 +-
 5 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56050a9..42079fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-oxygen-gtk3 (1.0.2-1) unstable; urgency=low
+oxygen-gtk3 (1.0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #657731) 
 
- -- Philip Muškovac <yofel at kubuntu.org>  Wed, 11 Apr 2012 15:24:19 +0200
+ -- Philip Muškovac <yofel at kubuntu.org>  Mon, 21 May 2012 19:16:31 +0200
diff --git a/debian/control b/debian/control
index 1855438..413df4b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,9 @@ Source: oxygen-gtk3
 Section: gnome
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Philip Muškovac <yofel at kubuntu.org>
+Uploaders: Dmitry Smirnov <onlyjob at member.fsf.org>, Philip Muškovac <yofel at kubuntu.org>
 Build-Depends: cmake (>= 2.8.4+dfsg.1-3),
                debhelper (>= 9),
-               libglib2.0-dev (>= 2.26.0),
                libgtk-3-dev
 Standards-Version: 3.9.3
 Homepage: https://projects.kde.org/projects/playground/artwork/oxygen-gtk
diff --git a/debian/copyright b/debian/copyright
index 814d539..a96108b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,51 +1,25 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: oxygen-gtk
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: oxygen-gtk3
 Source: https://projects.kde.org/projects/playground/artwork/oxygen-gtk
 
 Files: *
-Copyright: 2009-2011 Hugo Pereira Da Costa <hugo at oxygen-icons.org>
-           2007 Matthew Woehlke <mw_triad at users.sourceforge.net>
-           2007 Thomas Zander <zander at kde.org>
-           2007 Zack Rusin <zack at kde.org>
-           2008 Robert Staudinger <robert.staudinger at gmail.com>
-           2010-2011 Ruslan Kabatsayev <b7.10110111 at gmail.com>
-           2001 Red Hat, Inc. <@redhat.com>
-           2006 Andrew Johnson <acjgenius at earthlink.net>
+Copyright: 2006      Andrew Johnson <acjgenius at earthlink.net>
            2006-2007 Benjamin Berg <benjamin at sipsolutions.net>
-           2010 Cédric Bellegarde <gnumdk at gmail.com>
+           2010      Cédric Bellegarde <gnumdk at gmail.com>
            2003-2010 Craig Drummond <craig.p.drummond at gmail.com>
-           2010 Nokia Corporation and/or its subsidiary(-ies)
+           2010-2012 Hugo Pereira Da Costa <hugo at oxygen-icons.org>
+           2007      Matthew Woehlke <mw_triad at users.sourceforge.net>
+           2010      Nokia Corporation and/or its subsidiary(-ies)
+           2001      Red Hat, Inc. <@redhat.com>
+           2008      Robert Staudinger <robert.staudinger at gmail.com>
+           2010-2012 Ruslan Kabatsayev <b7.10110111 at gmail.com>
+           2007      Thomas Zander <zander at kde.org>
+           2007      Zack Rusin <zack at kde.org>
 License: LGPL-2+
 
-Files: src/oxygenanimationmodes.h src/oxygenanimationdata.h
+Files: src/oxygenanimationdata.h src/oxygenanimationmodes.h
 Copyright: 2009 Hugo Pereira Da Costa <hugo.pereira at free.fr>
-License: MIT/X11
-
-Files: debian/*
-Copyright: 2012 Philip Muškovac <yofel at kubuntu.org>
-License: LGPL-2+
-
-License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the full text of the GNU Library General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-2'.
-
-License: MIT/X11
+License: MIT/X11 (BSD like)
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to
  deal in the Software without restriction, including without limitation the
@@ -63,3 +37,25 @@ License: MIT/X11
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  IN THE SOFTWARE.
+
+Files: debian/*
+Copyright: 2010-2011 Fathi Boudra <fabo at debian.org>
+           2011-2012 Kai Wasserbäch <curan at debian.org>
+           2012      Dmitry Smirnov <onlyjob at member.fsf.org>
+           2012      Philip Muškovac <yofel at kubuntu.org>
+License: LGPL-2+
+
+License: LGPL-2+
+ This package 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 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
+ Lesser General Public License for more details.
+ .
+ The complete text of the GNU Lesser General Public License
+ can be found in "/usr/share/common-licenses/LGPL-2".
+
diff --git a/debian/rules b/debian/rules
index d2d1c4f..2fdbab0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,15 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
+
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DDEBIAN_NO_DEMOS=1 \
-		-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=yes
+		-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=yes \
+		-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
 
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/gtk-3.0
-
-override_dh_shlibdeps:
-	dh_shlibdeps -- -xlibgtk-3-0
-
-.PHONY: override_dh_makeshlibs override_dh_auto_configure override_dh_shlibdeps
diff --git a/debian/watch b/debian/watch
index 0b4e98f..bb4e91d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
 
 opts=pasv \
-  ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk3/([\d\.]+)/src/oxygen-gtk3-([\d\.]+)\.tar\.bz2
+  ftp://ftp.kde.org/pub/kde/stable/oxygen-gtk3/([\d\.]+)/src/oxygen-gtk3-([\d\.]+)\.tar\.(?:bz2|xz|gz)

-- 
oxygen-gtk3 packaging

