r12172 - in /packages/unstable/gnome-app-install/debian: binfiles/ changelog control control.in patches/01_debian_distro.patch patches/02_software-properties.patch patches/04_documentation.patch rules
jak-guest at users.alioth.debian.org
jak-guest at users.alioth.debian.org
Tue Jul 31 15:34:25 UTC 2007
Author: jak-guest
Date: Tue Jul 31 15:34:25 2007
New Revision: 12172
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12172
Log:
* Merge changelog entries from Ubuntu
* Use ubuntu-get-source and b-d on gnome-pkg-tools (>= 0.12.3)
* debian/patches:
- 01_debian_distro.patch: Updated
- 02_software-properties.patch, 04_documentation.patch: removed
Removed:
packages/unstable/gnome-app-install/debian/binfiles/
packages/unstable/gnome-app-install/debian/patches/02_software-properties.patch
packages/unstable/gnome-app-install/debian/patches/04_documentation.patch
Modified:
packages/unstable/gnome-app-install/debian/changelog
packages/unstable/gnome-app-install/debian/control
packages/unstable/gnome-app-install/debian/control.in
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=12172&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/changelog (original)
+++ packages/unstable/gnome-app-install/debian/changelog Tue Jul 31 15:34:25 2007
@@ -1,10 +1,42 @@
-gnome-app-install (0.4.4-1) unstable; urgency=low
+gnome-app-install (0.4.5-1) unstable; urgency=low
* New upstream release
- * Drop +debian in version, as ubuntu uses 0.4.4ubuntu1
- * 01_debian_distro.patch: Updated
+ * Merge the changelog entries from Ubuntu
+ * Use ubuntu-get-source and b-d on gnome-pkg-tools (>= 0.12.3)
+ * debian/patches:
+ - 01_debian_distro.patch: Updated
+ - 02_software-properties.patch, 04_documentation.patch: removed
-- Julian Andres Klode <jak at jak-linux.org> Tue, 31 Jul 2007 14:32:10 +0200
+
+gnome-app-install (0.4.5-0ubuntu1) gutsy; urgency=low
+
+ [ Sebastian Heinlein ]
+ * Window id has to be stored as an integer - fix LP #129416
+
+ [ Julian Andres Klode ]
+ * Switch to CDBS
+ * check whether to use software-properties-gtk or software-properties
+ * help/C/figures/*: Updated
+ * help/{de,sv}: disabled
+ * po/POTFILES.in: add AppInstall/activation.py
+ * Remove installation part in the docs and the Ubuntu ML
+
+ -- Michael Vogt <michael.vogt at ubuntu.com> Tue, 31 Jul 2007 16:38:53 +0200
+
+gnome-app-install (0.4.4ubuntu1) gutsy; urgency=low
+
+ * Add an installer only mode for the mime type handler and codec
+ installation
+ * Do not show the confirmation dialog anymore in the installer only mode
+ * Allow to search and choose different filters in the installer mode
+ (only used by the mime type installer)
+ * Rename the add/remove button to apply changes
+ * Improve command line handling
+ * Some code refractioning
+ * Add a XUL extension manager mode
+
+ -- Sebastian Heinlein <glatzor at ubuntu.com> Mon, 30 Jul 2007 11:59:04 +0200
gnome-app-install (0.4.3+debian-2) unstable; 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=12172&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/control (original)
+++ packages/unstable/gnome-app-install/debian/control Tue Jul 31 15:34:25 2007
@@ -6,8 +6,9 @@
Build-Depends: cdbs,
debhelper (>= 5.0.38),
gettext,
- gnome-pkg-tools,
+ gnome-pkg-tools (>= 0.12.3),
intltool,
+ lsb-release,
python,
python-central (>= 0.5),
python-distutils-extra (>= 1.90)
@@ -18,20 +19,18 @@
Architecture: all
Depends: ${python:Depends},
${misc:Depends},
- app-install-data (>= 0.4.3),
+ ${distro:Depends},
+ app-install-data (>= 0.4.0),
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
+ synaptic (>= 0.57.8)
XB-Python-Version: ${python:Versions}
Description: GNOME Application Installer
A pretty application installer for GNOME. It can also search for mime
Modified: 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=12172&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/control.in (original)
+++ packages/unstable/gnome-app-install/debian/control.in Tue Jul 31 15:34:25 2007
@@ -6,8 +6,9 @@
Build-Depends: cdbs,
debhelper (>= 5.0.38),
gettext,
- gnome-pkg-tools,
+ gnome-pkg-tools (>= 0.12.3),
intltool,
+ lsb-release,
python,
python-central (>= 0.5),
python-distutils-extra (>= 1.90)
@@ -18,20 +19,18 @@
Architecture: all
Depends: ${python:Depends},
${misc:Depends},
- app-install-data (>= 0.4.3),
+ ${distro:Depends},
+ app-install-data (>= 0.4.0),
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
+ synaptic (>= 0.57.8)
XB-Python-Version: ${python:Versions}
Description: GNOME Application Installer
A pretty application installer for GNOME. It can also search for mime
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=12172&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 15:34:25 2007
@@ -11,18 +11,6 @@
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 "
-- "legal terms in some countries."
-+ "legal terms in some countries. "
- "Debian provides support and "
- "security updates.") % app.name
- icon_name = "application-debian-non-free"
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
Modified: packages/unstable/gnome-app-install/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-app-install/debian/rules?rev=12172&op=diff
==============================================================================
--- packages/unstable/gnome-app-install/debian/rules (original)
+++ packages/unstable/gnome-app-install/debian/rules Tue Jul 31 15:34:25 2007
@@ -1,32 +1,28 @@
#!/usr/bin/make -f
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+ | cut -f1 -d-)
-DEB_TARBALL := ../tarballs/gnome-app-install_$(VERSION).orig.tar.gz
-UBU_TARBALL := 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
+# Include CDBS Stuff
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
+include /usr/share/gnome-pkg-tools/1/rules/ubuntu-get-source.mk
-get-orig-source:
- # needs: wget gzip tar
- [ -d ../tarballs ] || mkdir ../tarballs
- wget -O - $(UBU_TARBALL) | gzip -d | tar --delete gnome-app-install-$(VERSION)ubuntu1/debian | gzip -9 > $(DEB_TARBALL)
+ifeq ($(DISTRIBUTION), Ubuntu)
+# Building on Ubuntu
+ DEB_PATCHDIRS := debian/patches.ubuntu
+ ADDITIONAL_DEPS := app-install-data-commercial, python-gconf, python-gtkhtml2, python-launchpad-integration, sexy-python, software-properties-gtk
+else
+#Building on Debian
+ ADDITIONAL_DEPS := python-gnome2-extras, python-sexy, update-manager
+endif
clean::
rm -rf build
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
- @if [ -e debian/binfiles/$(cdbs_curpkg).tar.gz.uuencoded ]; then \
- echo Unpacking binary files for package $(cdbs_curpkg); \
- perl -ne 'print(unpack "u", $$_);' debian/binfiles/$(cdbs_curpkg).tar.gz.uuencoded | tar -C debian/$(cdbs_curpkg) -xzf - || exit 0; \
- fi
-
+ echo "distro:Depends=$(ADDITIONAL_DEPS)" >> debian/$(cdbs_curpkg).substvars
dh_scrollkeeper -p$(cdbs_curpkg) $(DEB_DH_SCROLLKEEPER_ARGS)
dh_gconf -p$(cdbs_curpkg) $(DEB_DH_GCONF_ARGS)
dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS)
More information about the pkg-gnome-commits
mailing list