Merge lp:~stefanor/gapti/py27transition into lp:gapti

[Stefano Rivera]

[Savvas Radevic (medigeek)]

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2010-12-12 16:43:28 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
 
=== modified file 'debian/changelog'
--- debian/changelog	2009-04-03 01:11:25 +0000
+++ debian/changelog	2010-12-12 16:43:28 +0000
@@ -1,5 +1,6 @@
-gapti (0.0.3) jaunty; urgency=low
+gapti (0.0.3ubuntu1) natty; urgency=low
 
+  [ Savvas Radevic ]
   * Bug-fix release.
   * python 2.6 transition (LP: #340901)
     + debian/control: Build-Depends: python-dev, python-support
@@ -13,7 +14,46 @@
     + debhelper (>= 7)
   * debian/rules: Removed sed command that changed shebangs
 
- -- Savvas Radevic <[e-mail]>  Wed, 11 Mar 2009 01:14:21 +0100
+  [ Stefano Rivera ]
+  * Python 2.7 transition: Remove python version restrictions. (LP: #689318)
+  * Convert to dh_python2.
+    - Install as a private module in /usr/share/gapti
+  * Use minimal dh7 rules.
+  * Use 3.0 (native) source format.
+  * Bumped Standards-Version to 3.9.1:
+    - Point to versioned common-licence (GPL-3).
+  * debian/control:
+    - Depend on software-properties-gtk.
+    - Add Homepage.
+
+ -- Stefano Rivera <[e-mail]>  Sun, 12 Dec 2010 17:55:05 +0200
+
+gapti (0.0.2ubuntu6) natty; urgency=low
+
+  * Rebuild with python 2.7 as the python default.
+
+ -- Matthias Klose <[e-mail]>  Wed, 08 Dec 2010 15:03:01 +0000
+
+gapti (0.0.2ubuntu5) jaunty; urgency=low
+
+  [ Savvas Radevic ]
+  * debian/rules:
+    Fixed module calls: UpdateManager.Common to UpdateManager
+
+  [ Scott Kitterman ]
+  * Convert ${python:Depends} to a python dependency manually since package
+    does not use one of the Python helper systems
+
+ -- Scott Kitterman <[e-mail]>  Sun, 19 Apr 2009 11:09:30 -0400
+
+gapti (0.0.2ubuntu4) jaunty; urgency=low
+
+  * Move to Python 2.6
+    - Update locations in gapti.links and gapti.install
+    - Update build-dep to python2.6-dev
+  * Move build-depends-indep to build-depends to satisfy clean
+
+ -- Scott Kitterman <[e-mail]>  Sat, 28 Mar 2009 14:29:39 -0400
 
 gapti (0.0.2ubuntu3) intrepid; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2009-04-03 01:11:25 +0000
+++ debian/control	2010-12-12 16:43:28 +0000
@@ -1,21 +1,24 @@
 Source: gapti
 Section: admin
 Priority: optional
-Maintainer: Jerry Haltom <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Jerry Haltom <[e-mail]>
 Uploaders: Savvas Radevic <[e-mail]>
-Build-Depends: debhelper (>= 7), python-support, python-dev
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.5-13~)
+X-Python-Version: all
+Standards-Version: 3.9.1
+Homepage: http://launchpad.net/gapti
 
 Package: gapti
 Architecture: all
 Depends: ${python:Depends},
          ${misc:Depends},
-         ${sh:Depends},
          python-gtk2 (>= 2.6.3-2),
          python-glade2 (>= 2.6.3-2),
          python-apt (>= 0.6.16.2),
          python-vte (>= 1:0.11.15-4),
          gksu (>= 1.3.6-1),
+         software-properties-gtk,
          synaptic,
          update-notifier (>= 0.42)
 Description: tool to process .apt files
 
=== modified file 'debian/copyright'
--- debian/copyright	2009-04-03 01:11:25 +0000
+++ debian/copyright	2010-12-12 16:43:28 +0000
@@ -25,5 +25,5 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-On a Debian system, see /usr/share/common-licenses/GPL
+On a Debian system, see /usr/share/common-licenses/GPL-3
 The debian package is under the same license.
 
=== removed file 'debian/pycompat'
--- debian/pycompat	2009-03-16 16:24:38 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2
 
=== removed file 'debian/pyversions'
--- debian/pyversions	2009-03-16 16:24:38 +0000
+++ debian/pyversions	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
--2.6
 
=== modified file 'debian/rules'
--- debian/rules	2009-04-03 01:20:08 +0000
+++ debian/rules	2010-12-12 16:43:28 +0000
@@ -1,47 +1,12 @@
 #!/usr/bin/make -f
 
-PYVERS=$(shell pyversions -vd)
-PKG=gapti
-PYSUPPORTDIR=usr/share/python-support/$(PKG)
-BASE=debian/$(PKG)
-
-clean:
-	dh $@
-	find . -name '*.pyc' -exec rm "{}" \;
-	find . -name '*~' -exec rm "{}" \;
-	find . -name '.bzr' -exec rm "{}" \;
-	python setup.py clean --all
-
-build: clean
-	dh $@
-	python setup.py build
-
-install: build
-	dh $@
-	python setup.py install --no-compile --root=$(BASE) --install-layout=deb
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_desktop
-	dh_installmime
-	dh_installdocs README
-	dh_installexamples photoshop.apt
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_link $(PYSUPPORTDIR)/gapti/main.py usr/bin/gapti
-	dh_link $(PYSUPPORTDIR)/gapti/root.py usr/share/gapti/gapti-root
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_pysupport
-	chmod 755 $(BASE)/$(PYSUPPORTDIR)/gapti/main.py $(BASE)/$(PYSUPPORTDIR)/gapti/root.py
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-arch: build install
-binary: binary-indep binary-arch
-.PHONY: clean build install binary binary-indep binary-arch
+%:
+	dh $@ --with python2
+
+override_dh_auto_install:
+	dh_auto_install -- --install-lib /usr/share/gapti
+	# Install binary symlinks:
+	rm -f debian/gapti/usr/share/gapti/gapti-root
+	cd debian/gapti/usr/share/gapti/gapti/ && chmod +x main.py root.py
+	dh_link usr/share/gapti/gapti/root.py usr/share/gapti/gapti-root
+	dh_link usr/share/gapti/gapti/main.py usr/bin/gapti
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-12-12 16:43:28 +0000
@@ -0,0 +1,1 @@
+3.0 (native)
 
=== modified file 'mime/gapti.xml'
--- mime/gapti.xml	2009-03-16 16:24:38 +0000
+++ mime/gapti.xml	2010-12-12 16:43:28 +0000
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
         <mime-type type="application/x-apt">
-		<sub-class-of type="text/plain"/>
+                <sub-class-of type="text/plain"/>
                 <comment>Remote software package</comment>
-		<magic priority="80">
-			<match type="string" value="#@application/x-apt" offset="0:0"/>
-		</magic>
+                <magic priority="80">
+                        <match type="string" value="#@application/x-apt" offset="0:0"/>
+                </magic>
                 <glob pattern="*.apt"/>
         </mime-type>
 </mime-info>