r12099 - in /packages/unstable/gnome-app-install/debian: ./ changelog control control.in copyright docs gnome-app-install.postinst gnome-app-install.postrm patches/03_desktop.patch postinst postrm pycompat rules

jak-guest at users.alioth.debian.org jak-guest at users.alioth.debian.org
Thu Jul 26 14:17:57 UTC 2007 

Author: jak-guest
Date: Thu Jul 26 14:17:57 2007
New Revision: 12099

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12099
Log:
* gnome-app-install master checkin

Added:
    packages/unstable/gnome-app-install/debian/control.in
    packages/unstable/gnome-app-install/debian/patches/03_desktop.patch
    packages/unstable/gnome-app-install/debian/postinst
      - copied unchanged from r12098, packages/unstable/gnome-app-install/debian/gnome-app-install.postinst
    packages/unstable/gnome-app-install/debian/postrm
      - copied unchanged from r12098, packages/unstable/gnome-app-install/debian/gnome-app-install.postrm
Removed:
    packages/unstable/gnome-app-install/debian/gnome-app-install.postinst
    packages/unstable/gnome-app-install/debian/gnome-app-install.postrm
    packages/unstable/gnome-app-install/debian/pycompat
Modified:
    packages/unstable/gnome-app-install/debian/   (props changed)
    packages/unstable/gnome-app-install/debian/changelog
    packages/unstable/gnome-app-install/debian/control
    packages/unstable/gnome-app-install/debian/copyright
    packages/unstable/gnome-app-install/debian/docs
    packages/unstable/gnome-app-install/debian/rules

Propchange: packages/unstable/gnome-app-install/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: packages/unstable/gnome-app-install/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/changelog?rev=12099&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/changelog (original)
+++ packages/unstable/gnome-app-install/debian/changelog Thu Jul 26 14:17:57 2007
@@ -1,17 +1,46 @@
-gnome-app-install (0.4.2+debian-1) unstable; urgency=low
-
-  [ Sebastian Heinlein ]
-  * Initial upload to Debian
-
- -- Julian Andres Klode <jak at jak-linux.org>  Mon, 25 Jun 2007 14:54:46 +0200
+gnome-app-install (0.4.3+debian-1) unstable; urgency=low
+
+  * Initial upload to Debian (Closes: #391309)
+  * Switch to CDBS
+
+ -- Julian Andres Klode <jak at jak-linux.org>  Thu, 26 Jul 2007 13:41:02 +0200
+
+gnome-app-install (0.4.3) gutsy; urgency=low
+
+  [Sebastian Heinlein]
+  * Switch to python-distutils-extra 
+  * fix POTFILES.in (LP: #125046)
+  
+  [Michael Vogt]
+  * do not display a application start icon for desktop
+    files without execCmd
+  * fix double del of a ActionGroup (LP: #126117)
+  * AppInstall/Menu.py, AppInstall/CoreMenu.py:
+    - code cleanup
+  
+  [Julian Andres Klode]
+  * AppInstall/AppInstall.py:
+    - If close button of the window manager was pressed and there are no
+      pending changes, quit.
+    - If there are pending changes, ask what to do
+  * AppInstall/distros/Debian.py:
+    - Merge changes from Ubuntu.py
+    - Use the new Debian icons
+    - Improve the descriptions
+  * debian/control:
+    - Cleanup build-depends
+  * data/icons/16x16/apps/application-debian-*.png:
+    - Add icons for Debian
+
+ -- Michael Vogt <michael.vogt at ubuntu.com>  Wed, 25 Jul 2007 22:12:19 +0200
 
 gnome-app-install (0.4.2) gutsy; urgency=low
 
   * Fix in the gstreamer caps support (LP#117157)
   * added README.codecs
-  * added README.extraction (LP##107097)
-
- -- Michael Vogt <michael.vogt at ubuntu.com>  Mon, 21 May 2007 21:47:55 +0200
+  * added README.extraction (LP#107097)
+
+ -- Michael Vogt <michael.vogt at ubuntu.com>  Mon, 04 Jun 2007 16:12:49 +0200
 
 gnome-app-install (0.4.1) gutsy; urgency=low
 

Modified: packages/unstable/gnome-app-install/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/control?rev=12099&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/control (original)
+++ packages/unstable/gnome-app-install/debian/control Thu Jul 26 14:17:57 2007
@@ -2,16 +2,14 @@
 Section: gnome
 Priority: optional
 Maintainer: Julian Andres Klode <jak at jak-linux.org>
-Uploaders:  Sebastian Heinlein <glatzor at ubuntu.com>
-Build-Depends: debhelper (>= 5.0.38), python, python-all-dev(>= 2.3.5-11), gettext, intltool, python-central (>= 0.5), cdbs
+Uploaders:  Sebastian Heinlein <glatzor at ubuntu.com>,  Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Build-Depends: cdbs, debhelper (>= 5.0.38), gettext, intltool, python, python-central (>= 0.5), python-distutils-extra (>= 1.90)
 Standards-Version: 3.7.2
 XS-Python-Version: >= 2.4
-XS-Vcs-Bzr: https://launchpad.net/~ubuntu-core-dev/+branch/gnome-app-install/main
 
 Package: gnome-app-install
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, synaptic (>= 0.57.8), python-gnome2-extras, python-glade2 (>= 2.4.0), python-apt (>= 0.6.20), python-xdg (>= 0.8), gnome-icon-theme, app-install-data, python-dbus, gksu, python-gdbm, python-gtk2 (>= 2.10.1), update-manager, python-gst0.10, python-sexy
-Conflicts: gnome-app-install-data
+Depends: ${python:Depends}, ${misc:Depends},  app-install-data, gksu, gnome-icon-theme, python-apt (>= 0.6.20), python-dbus, python-gdbm, python-glade2 (>= 2.4.0), python-gnome2-extras, python-gst0.10, python-gtk2 (>= 2.10.1), python-sexy, python-xdg (>= 0.8), synaptic (>= 0.57.8), update-manager
 XB-Python-Version: ${python:Versions}
 Description: GNOME Application Installer
  A pretty application installer for GNOME. It can also search for mime

Added: packages/unstable/gnome-app-install/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/control.in?rev=12099&op=file
==============================================================================
--- packages/unstable/gnome-app-install/debian/control.in (added)
+++ packages/unstable/gnome-app-install/debian/control.in Thu Jul 26 14:17:57 2007
@@ -1,0 +1,16 @@
+Source: gnome-app-install
+Section: gnome
+Priority: optional
+Maintainer: Julian Andres Klode <jak at jak-linux.org>
+Uploaders:  Sebastian Heinlein <glatzor at ubuntu.com>,  @GNOME_TEAM@
+Build-Depends: cdbs, debhelper (>= 5.0.38), gettext, intltool, python, python-central (>= 0.5), python-distutils-extra (>= 1.90)
+Standards-Version: 3.7.2
+XS-Python-Version: >= 2.4
+
+Package: gnome-app-install
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends},  app-install-data, gksu, gnome-icon-theme, python-apt (>= 0.6.20), python-dbus, python-gdbm, python-glade2 (>= 2.4.0), python-gnome2-extras, python-gst0.10, python-gtk2 (>= 2.10.1), python-sexy, python-xdg (>= 0.8), synaptic (>= 0.57.8), update-manager
+XB-Python-Version: ${python:Versions}
+Description: GNOME Application Installer
+ A pretty application installer for GNOME. It can also search for mime
+ types or gstreamer codecs.

Modified: packages/unstable/gnome-app-install/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/copyright?rev=12099&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/copyright (original)
+++ packages/unstable/gnome-app-install/debian/copyright Thu Jul 26 14:17:57 2007
@@ -29,7 +29,6 @@
 	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'.
 

Modified: packages/unstable/gnome-app-install/debian/docs
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/docs?rev=12099&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/docs (original)
+++ packages/unstable/gnome-app-install/debian/docs Thu Jul 26 14:17:57 2007
@@ -1,4 +1,3 @@
 NEWS
 README*
 TODO
-Changelog

Added: packages/unstable/gnome-app-install/debian/patches/03_desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/patches/03_desktop.patch?rev=12099&op=file
==============================================================================
--- packages/unstable/gnome-app-install/debian/patches/03_desktop.patch (added)
+++ packages/unstable/gnome-app-install/debian/patches/03_desktop.patch Thu Jul 26 14:17:57 2007
@@ -1,0 +1,38 @@
+diff -Nur gnome-app-install-0.4.3+debian/data/gnome-app-install.desktop.in gnome-app-install-0.4.3+debian.new/data/gnome-app-install.desktop.in
+--- gnome-app-install-0.4.3+debian/data/gnome-app-install.desktop.in	2007-07-26 16:17:26.594834277 +0200
++++ gnome-app-install-0.4.3+debian.new/data/gnome-app-install.desktop.in	2007-07-26 16:17:29.595005367 +0200
+@@ -1,13 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Add/Remove...
++_Name=Add/Remove Applications
+ _GenericName=Package Manager
+ _Comment=Install and remove applications
+ Exec=/usr/bin/gnome-app-install
+ Icon=gnome-app-install
+ Terminal=false
+ Type=Application
+-Categories=PackageManager;GTK;
++Categories=PackageManager;GTK;Applications;System;
+ StartupNotify=true
+ X-KDE-SubstituteUID=true
+ OnlyShowIn=GNOME;
+diff -Nur gnome-app-install-0.4.3+debian/data/gnome-app-install-xfce.desktop.in gnome-app-install-0.4.3+debian.new/data/gnome-app-install-xfce.desktop.in
+--- gnome-app-install-0.4.3+debian/data/gnome-app-install-xfce.desktop.in	2007-07-26 16:17:26.594834277 +0200
++++ gnome-app-install-0.4.3+debian.new/data/gnome-app-install-xfce.desktop.in	2007-07-26 16:17:29.595005367 +0200
+@@ -1,13 +1,13 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-_Name=Add/Remove...
++_Name=Add/Remove Applications
+ _GenericName=Package Manager
+ _Comment=Install and remove applications
+ Exec=/usr/bin/gnome-app-install
+ Icon=gnome-app-install
+ Terminal=false
+ Type=Application
+-Categories=PackageManager;System;
++Categories=PackageManager;Applications;System;
+ StartupNotify=true
+ NotShowIn=GNOME;
+ X-Ubuntu-Gettext-Domain=gnome-app-install

Modified: packages/unstable/gnome-app-install/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/rules?rev=12099&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/rules (original)
+++ packages/unstable/gnome-app-install/debian/rules Thu Jul 26 14:17:57 2007
@@ -1,19 +1,25 @@
 #!/usr/bin/make -f
   
-DEB_AUTO_CLEANUP_RCS            := yes
-
-DEB_PYTHON_SYSTEM=pycentral
+DEB_AUTO_CLEANUP_RCS := yes
+DEB_PYTHON_SYSTEM    := pycentral
+# Version without +debian, debian revision and epochs
+VERSION              := $(shell dpkg-parsechangelog | grep ^Version: | cut -f2 -d " " | cut -f1- -d: | cut -f1 -d+)
+DEB_TARBALL          := ../tarballs/gnome-app-install_$(VERSION)+debian.orig.tar.gz
+UBU_TARBALL          := http://archive.ubuntu.com/ubuntu/pool/main/g/gnome-app-install/gnome-app-install_$(VERSION).tar.gz
 
 # Add here any variable or target overrides you need
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 
-ifdef _cdbs_rules_debhelper
-$(patsubst %,binary-install/%,software-properties-gtk) :: binary-install/%:
+get-orig-source:
+	# needs: wget gzip tar
+	[ -d ../tarballs ] || mkdir ../tarballs
+	wget -O - $(UBU_TARBALL) | gzip -d | tar --delete gnome-app-install-$(VERSION)/debian | gzip -9  > $(DEB_TARBALL)
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
 	dh_scrollkeeper -p$(cdbs_curpkg) $(DEB_DH_SCROLLKEEPER_ARGS)
-	$(if $(wildcard /usr/bin/dh_gconf),dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS))
-	$(if $(wildcard /usr/bin/dh_desktop),dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS))
-	$(if $(wildcard /usr/bin/dh_iconcache),dh_iconcache -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS))
-endif
+	dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS)
+	dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)
+	$(if $(wildcard /usr/bin/dh_iconcache),dh_iconcache -p$(cdbs_curpkg))

More information about the pkg-gnome-commits mailing list