[Python-apps-commits] r7965 - in packages/glipper/trunk/debian (5 files)

[josernesto-guest at users.alioth.debian.org]

    Date: Saturday, December 17, 2011 @ 02:22:29
  Author: josernesto-guest
Revision: 7965

[svn-inject] Applying Debian modifications (2.1-1) to trunk

Modified:
  packages/glipper/trunk/debian/changelog
  packages/glipper/trunk/debian/control
  packages/glipper/trunk/debian/copyright
  packages/glipper/trunk/debian/rules
Deleted:
  packages/glipper/trunk/debian/patches/

Modified: packages/glipper/trunk/debian/changelog
===================================================================
--- packages/glipper/trunk/debian/changelog	2011-12-17 02:12:04 UTC (rev 7964)
+++ packages/glipper/trunk/debian/changelog	2011-12-17 02:22:29 UTC (rev 7965)
@@ -1,18 +1,35 @@
-glipper (2.1-1) UNRELEASED; urgency=low
+glipper (2.1-1) unstable; urgency=low
 
   * New Maintainer (Closes: #583244).
+  * debian/control:
+    - Added ${dist:Depends} to generate different Depends for Debian/Ubuntu.
+  * debian/rules:
+    - Overrided dh_gencontrol.
+
+  [ Laszlo Pandy ]
+
   * New upstream release.
   * debian/watch:
     - Updated to new download location on launchpad.net.
   * debian/copyright:
     - Add new upstream author.
     - Change download location to new launchpad.net project.
+  * debian/compat:
+    + Update to debhelper 7.
+  * debian/rules:
+    + Remove all rules and replace with debhelper template because upstream build system has changed.
+  * debian/docs:
+    - Remove TODO and NEWS; they no longer exist upstream.
+  * debian/glipper.NEWS:
+    + Add new upstream version description.
   * debian/control:
     - Bump Standars-Version to 3.9.2
-    - Change Homepage to new launchpad.net project.
+    - Change Homepage to new launchpad.net project (Closes: #615315).
     - Update build dependencies for new upstream build system (python-distutils).
+    - Add python-xdg dependency.
+    - Remove dependency on python-glade2 (Closes: #551459).
 
- -- Jose Ernesto Davila Pantoja <josernestodavila at ubuntu.com>  Tue, 23 Aug 2011 21:12:38 -0600
+ -- Jose Ernesto Davila Pantoja <josernestodavila at ubuntu.com>  Tue, 13 Sep 2011 15:17:19 -0600
 
 glipper (1.0-1.1) unstable; urgency=medium
 

Modified: packages/glipper/trunk/debian/control
===================================================================
--- packages/glipper/trunk/debian/control	2011-12-17 02:12:04 UTC (rev 7964)
+++ packages/glipper/trunk/debian/control	2011-12-17 02:22:29 UTC (rev 7965)
@@ -2,13 +2,14 @@
 Section: utils
 Priority: optional
 Maintainer: Jose Ernesto Davila Pantoja <josernestodavila at ubuntu.com>
-Build-Depends: debhelper (>= 7), python-support, python (>=2.4), python-distutils-extra, gnome-doc-utils
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 7.0.50~), python (>=2.4), python-distutils-extra, gnome-doc-utils
 Standards-Version: 3.9.2
 Homepage: http://launchpad.net/glipper
 
 Package: glipper
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-gobject, python-gconf, gconf2, python-gtk2, python-keybinder, python-xdg, python-gnomeapplet
+Depends: ${python:Depends}, ${misc:Depends}, ${dist:Depends}, python-gobject, python-gconf, gconf2, python-gtk2, python-keybinder, python-xdg
 Recommends: python-prctl, yelp, python-crypto
 Description: Clipboard manager for GNOME
  Glipper appears in the notification area. It maintains a history of text

Modified: packages/glipper/trunk/debian/copyright
===================================================================
--- packages/glipper/trunk/debian/copyright	2011-12-17 02:12:04 UTC (rev 7964)
+++ packages/glipper/trunk/debian/copyright	2011-12-17 02:22:29 UTC (rev 7965)
@@ -1,17 +1,19 @@
 This package was debianized by Neil Williams <linux at codehelp.co.uk> on
 Thu, 14 Sep 2006 11:40:26 +0100.
 
-The current Debian maintainer is Davide truffa <davide at catoblepa.org>
+The current Debian maintainer is Jose Ernesto Davila Pantoja <josernestodavila at ubuntu.com>
 
-It was downloaded from http://glipper.sourceforge.net/
+It was downloaded from http://launchpad.net/glipper
 
 Upstream Authors: Sven Rech <svenrech at gmx.de>
                   Eugenio Depalo <eugeniodepalo at mac.com>
                   Karderio <karderio at gmail.com
+                  Laszlo Pandy <laszlok2 at gmail.com>
 
-Copyright: 2006-2007 Sven Rech, Eugenio Depalo
+Copyright: 2006-2007 Sven Rech
+           2006-2007 Eugenio Depalo
+           2011 Laszlo Pandy
 
-
 License:
 
 This package is free software; you can redistribute it and/or modify

Modified: packages/glipper/trunk/debian/rules
===================================================================
--- packages/glipper/trunk/debian/rules	2011-12-17 02:12:04 UTC (rev 7964)
+++ packages/glipper/trunk/debian/rules	2011-12-17 02:22:29 UTC (rev 7965)
@@ -1,13 +1,16 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes), yes)
+	SUBSTVARS = -Vdist:Depends="python-appindicator"
+else
+	SUBSTVARS = -Vdist:Depends="python-gnomeapplet"
+endif
+
 %:
-	dh $@ 
+	dh $@ --with python2
+
+override_dh_gencontrol:
+	dh_gencontrol -- $(SUBSTVARS)