Package: base-files
Version: 6.4
Severity: normal
Tags: patch

Please add /etc/dpkg/origins/ubuntu (patch attached).

mozilla-devscripts uses "dpkg-vendor --query Vendor" to determine if it is run
on Debian or Ubuntu. It acts differently on both system. I added test cases
for Debian setting DEB_VENDOR=Debian and for Ubuntu setting DEB_VENDOR=Ubuntu,
but "DEB_VENDOR=Ubuntu dpkg-vendor --query Vendor" returns Debian, because
Ubuntu isn't know. Therefore the test cases fail and I can't upload the next
version of mozilla-devscripts.
diff -Nru base-files-6.4/debian/changelog base-files-6.4+nmu1/debian/changelog
--- base-files-6.4/debian/changelog	2011-05-27 14:25:48.000000000 +0200
+++ base-files-6.4+nmu1/debian/changelog	2011-07-09 19:24:13.000000000 +0200
@@ -1,3 +1,10 @@
+base-files (6.4+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add /etc/dpkg/origins/ubuntu, which will be useful for dpkg-vendor.
+
+ -- Benjamin Drung <[email protected]>  Sat, 09 Jul 2011 19:23:16 +0200
+
 base-files (6.4) unstable; urgency=low
 
   * Added /run. Closes: #620157.
diff -Nru base-files-6.4/debian/conffiles base-files-6.4+nmu1/debian/conffiles
--- base-files-6.4/debian/conffiles	2009-04-24 20:45:31.000000000 +0200
+++ base-files-6.4+nmu1/debian/conffiles	2011-07-09 19:23:05.000000000 +0200
@@ -1,5 +1,6 @@
 /etc/debian_version
 /etc/dpkg/origins/debian
+/etc/dpkg/origins/ubuntu
 /etc/host.conf
 /etc/issue
 /etc/issue.net
diff -Nru base-files-6.4/origins/ubuntu base-files-6.4+nmu1/origins/ubuntu
--- base-files-6.4/origins/ubuntu	1970-01-01 01:00:00.000000000 +0100
+++ base-files-6.4+nmu1/origins/ubuntu	2011-07-09 19:22:05.000000000 +0200
@@ -0,0 +1,4 @@
+Vendor: Ubuntu
+Vendor-URL: http://www.ubuntu.com/
+Bugs: https://bugs.launchpad.net/ubuntu/+filebug
+Parent: Debian

Reply via email to