r12156 - in /packages/unstable/gnome-app-install/debian: changelog patches/01_debian_distro.patch rules
jak-guest at users.alioth.debian.org
jak-guest at users.alioth.debian.org
Tue Jul 31 12:59:30 UTC 2007
Author: jak-guest
Date: Tue Jul 31 12:59:30 2007
New Revision: 12156
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12156
Log:
* New upstream release
* Drop +debian in version, as ubuntu uses 0.4.4ubuntu1
* 01_debian_distro.patch: Updated
Modified:
packages/unstable/gnome-app-install/debian/changelog
packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch
packages/unstable/gnome-app-install/debian/rules
Modified: packages/unstable/gnome-app-install/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/changelog?rev=12156&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/changelog (original)
+++ packages/unstable/gnome-app-install/debian/changelog Tue Jul 31 12:59:30 2007
@@ -1,3 +1,11 @@
+gnome-app-install (0.4.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Drop +debian in version, as ubuntu uses 0.4.4ubuntu1
+ * 01_debian_distro.patch: Updated
+
+ -- Julian Andres Klode <jak at jak-linux.org> Tue, 31 Jul 2007 14:32:10 +0200
+
gnome-app-install (0.4.3+debian-2) unstable; urgency=low
* debian/copyright
Modified: packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch?rev=12156&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch (original)
+++ packages/unstable/gnome-app-install/debian/patches/01_debian_distro.patch Tue Jul 31 12:59:30 2007
@@ -1,8 +1,20 @@
* Fix the distro name: we are Debian not Ubuntu
-=== modified file 'AppInstall/distros/Debian.py'
---- old/AppInstall/distros/Debian.py 2007-07-17 10:36:13 +0000
-+++ new/AppInstall/distros/Debian.py 2007-07-27 16:42:38 +0000
-@@ -120,7 +120,7 @@
+diff -Nur gnome-app-install-0.4.4/AppInstall/activation.py gnome-app-install-0.4.4.new/AppInstall/activation.py
+--- gnome-app-install-0.4.4/AppInstall/activation.py 2007-07-31 12:56:10.000000000 +0200
++++ gnome-app-install-0.4.4.new/AppInstall/activation.py 2007-07-31 14:51:18.852171172 +0200
+@@ -173,7 +173,7 @@
+ "media files. Do you want to search for a codec "
+ "that supports the selected file?\n\n"
+ "The search will also include software which is not "
+- "officially supported by Ubuntu."),
++ "officially supported by Debian."),
+ self.options.transient_for):
+ sys.exit(4)
+ return True
+diff -Nur gnome-app-install-0.4.4/AppInstall/distros/Debian.py gnome-app-install-0.4.4.new/AppInstall/distros/Debian.py
+--- gnome-app-install-0.4.4/AppInstall/distros/Debian.py 2007-07-31 12:56:10.000000000 +0200
++++ gnome-app-install-0.4.4.new/AppInstall/distros/Debian.py 2007-07-31 14:51:18.852171172 +0200
+@@ -114,7 +114,7 @@
elif app.component == "non-free":
tooltip = _("The use, modification and distribution "
"of %s is restricted by copyright or by "
@@ -11,10 +23,9 @@
"Debian provides support and "
"security updates.") % app.name
icon_name = "application-debian-non-free"
-
-=== modified file 'AppInstall/distros/__init__.py'
---- old/AppInstall/distros/__init__.py 2007-05-18 09:21:28 +0000
-+++ new/AppInstall/distros/__init__.py 2007-07-27 16:40:51 +0000
+diff -Nur gnome-app-install-0.4.4/AppInstall/distros/__init__.py gnome-app-install-0.4.4.new/AppInstall/distros/__init__.py
+--- gnome-app-install-0.4.4/AppInstall/distros/__init__.py 2007-05-21 21:34:41.000000000 +0200
++++ gnome-app-install-0.4.4.new/AppInstall/distros/__init__.py 2007-07-31 14:51:18.852171172 +0200
@@ -1,5 +1,5 @@
# DERIVATES: Please provide your own distro class and patch this statement
-from Ubuntu import Distribution
@@ -22,10 +33,9 @@
def get_distro():
"""
-
-=== modified file 'data/gnome-app-install.glade'
---- old/data/gnome-app-install.glade 2007-05-17 10:20:18 +0000
-+++ new/data/gnome-app-install.glade 2007-07-27 16:41:05 +0000
+diff -Nur gnome-app-install-0.4.4/data/gnome-app-install.glade gnome-app-install-0.4.4.new/data/gnome-app-install.glade
+--- gnome-app-install-0.4.4/data/gnome-app-install.glade 2007-07-31 12:56:10.000000000 +0200
++++ gnome-app-install-0.4.4.new/data/gnome-app-install.glade 2007-07-31 14:51:18.852171172 +0200
@@ -1313,7 +1313,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes"><big><b>Checking installed and available applications</b></big>
@@ -35,17 +45,3 @@
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
-
-=== modified file 'gnome-app-install'
---- old/gnome-app-install 2007-06-04 10:15:20 +0000
-+++ new/gnome-app-install 2007-07-27 16:37:28 +0000
-@@ -246,7 +246,7 @@
- "media files. Do you want to search for a codec "
- "that supports the selected file?\n\n"
- "The search will also include software which is not "
-- "officially supported by Ubuntu."),
-+ "officially supported by Debian."),
- transient_for):
- sys.exit(4)
- # ok, lets do it!
-
Modified: packages/unstable/gnome-app-install/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/rules?rev=12156&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/rules (original)
+++ packages/unstable/gnome-app-install/debian/rules Tue Jul 31 12:59:30 2007
@@ -2,9 +2,9 @@
DEB_AUTO_CLEANUP_RCS := yes
DEB_PYTHON_SYSTEM := pycentral
# Version without +debian, debian revision and epochs
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d ' ' | cut -f2- -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
+VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d ' ' | cut -f2- -d: | cut -f1 -d+ | cut -f1 -d-)
+DEB_TARBALL := ../tarballs/gnome-app-install_$(VERSION).orig.tar.gz
+UBU_TARBALL := http://launchpadlibrarian.net/8631529/gnome-app-install_0.4.4ubuntu1.tar.gz #http://archive.ubuntu.com/ubuntu/pool/main/g/gnome-app-install/gnome-app-install_$(VERSION)ubuntu1.tar.gz
# Add here any variable or target overrides you need
@@ -16,7 +16,7 @@
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)
+ wget -O - $(UBU_TARBALL) | gzip -d | tar --delete gnome-app-install-$(VERSION)ubuntu1/debian | gzip -9 > $(DEB_TARBALL)
clean::
rm -rf build
More information about the pkg-gnome-commits
mailing list