]> git.decadent.org.uk Git - dak.git/commitdiff
Merge remote-tracking branch 'ansgar/pu/multiarchive-1' into merge
authorJoerg Jaspert <joerg@debian.org>
Sun, 1 Jul 2012 12:14:35 +0000 (14:14 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 1 Jul 2012 12:14:35 +0000 (14:14 +0200)
* ansgar/pu/multiarchive-1:
  config.py: Add __contains__ method
  fstransactions.py: allow mode to be a string
  fstransactions.py: also use mode for directories
  tests: add a few packages for testing dak
  utils.py: add mail_addresses_for_upload function
  gpg_get_key_addresses: return a list instead of a set
  textutils.py: don't try to convert unicode strings again
  Add regexp to match .changes files.
  Correctly match version part of source tarballs
  dominate: convert to str
  Remove no longer used templates.
  Remove unused functions.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
35 files changed:
dak/dominate.py
daklib/config.py
daklib/fstransactions.py
daklib/regexes.py
daklib/textutils.py
daklib/utils.py
templates/process-accepted.install [deleted file]
templates/process-unchecked.bug-experimental-fixed [deleted file]
templates/process-unchecked.bug-nmu-fixed [deleted file]
templates/reject-proposed-updates.rejected [deleted file]
templates/security-install.advisory [deleted file]
tests/fixtures/packages/.gitignore [new file with mode: 0644]
tests/fixtures/packages/Makefile [new file with mode: 0644]
tests/fixtures/packages/gpg/pubring.gpg [new file with mode: 0644]
tests/fixtures/packages/gpg/random_seed [new file with mode: 0644]
tests/fixtures/packages/gpg/secring.gpg [new file with mode: 0644]
tests/fixtures/packages/gpg/trustdb.gpg [new file with mode: 0644]
tests/fixtures/packages/nonfree-package-0.1/debian/changelog [new file with mode: 0644]
tests/fixtures/packages/nonfree-package-0.1/debian/compat [new file with mode: 0644]
tests/fixtures/packages/nonfree-package-0.1/debian/control [new file with mode: 0644]
tests/fixtures/packages/nonfree-package-0.1/debian/nonfree-package.install [new file with mode: 0644]
tests/fixtures/packages/nonfree-package-0.1/debian/rules [new file with mode: 0755]
tests/fixtures/packages/nonfree-package-0.1/some-file [new file with mode: 0644]
tests/fixtures/packages/package-0.1/debian/changelog [new file with mode: 0644]
tests/fixtures/packages/package-0.1/debian/compat [new file with mode: 0644]
tests/fixtures/packages/package-0.1/debian/control [new file with mode: 0644]
tests/fixtures/packages/package-0.1/debian/package.install [new file with mode: 0644]
tests/fixtures/packages/package-0.1/debian/rules [new file with mode: 0755]
tests/fixtures/packages/package-0.1/some-file [new file with mode: 0644]
tests/fixtures/packages/package-built-using-0.1/debian/changelog [new file with mode: 0644]
tests/fixtures/packages/package-built-using-0.1/debian/compat [new file with mode: 0644]
tests/fixtures/packages/package-built-using-0.1/debian/control [new file with mode: 0644]
tests/fixtures/packages/package-built-using-0.1/debian/package-built-using.install [new file with mode: 0644]
tests/fixtures/packages/package-built-using-0.1/debian/rules [new file with mode: 0755]
tests/fixtures/packages/package-built-using-0.1/some-file [new file with mode: 0644]

index be8c52203958486c8ae229a300149efa22f09351..a6be1b035adc841f35fec7d83f6ac3c8e015e94b 100755 (executable)
@@ -134,8 +134,9 @@ def main():
         usage()
     if 'Suite' not in Options:
         query_suites = DBConn().session().query(Suite)
-        suites = [suite.suite_name for suite in query_suites.all()]
-        cnf['Obsolete::Options::Suite'] = ','.join(suites)
+        suites = [suite.suite_name for suite in query_suites]
+        cnf['Obsolete::Options::Suite'] = str(','.join(suites))
+
     Logger = daklog.Logger("dominate")
     session = DBConn().session()
     for suite_name in utils.split_args(Options['Suite']):
index 7e3c8bac582baf895a8a3b7f2b08d39d5619566c..1e9299f21bbd9e5e004741215e89771d20312b00 100755 (executable)
@@ -85,7 +85,10 @@ class Config(object):
         self.find_b = self.Cnf.find_b
 
     def has_key(self, name):
-        return self.Cnf.has_key(name)
+        return name in self.Cnf
+
+    def __contains__(self, name):
+        return name in self.Cnf
 
     def __getitem__(self, name):
         return self.Cnf[name]
index 8fb737674fecb30a9bb4d43e3d4433543399b857..f76a4bc67611fa0cab5f32d5f5d26bc883e4c456 100644 (file)
@@ -38,10 +38,19 @@ class _FilesystemCopyAction(_FilesystemAction):
         self.destination = destination
         self.need_cleanup = False
 
+        dirmode = 0o2755
+        if mode is not None:
+            dirmode = 0o2700 | mode
+            # Allow +x for group and others if they have +r.
+            if dirmode & 0o0040:
+                dirmode = dirmode | 0o0010
+            if dirmode & 0o0004:
+                dirmode = dirmode | 0o0001
+
         self.check_for_temporary()
         destdir = os.path.dirname(self.destination)
         if not os.path.exists(destdir):
-            os.makedirs(destdir, 0o2775)
+            os.makedirs(destdir, dirmode)
         if symlink:
             os.symlink(source, self.destination)
         elif link:
@@ -125,6 +134,9 @@ class FilesystemTransaction(object):
            symlink (bool): Create a symlink instead
            mode (int): Permissions to change `destination` to.
         """
+        if isinstance(mode, str) or isinstance(mode, unicode):
+            mode = int(mode, 8)
+
         self.actions.append(_FilesystemCopyAction(source, destination, link=link, symlink=symlink, mode=mode))
 
     def move(self, source, destination, mode=None):
@@ -160,6 +172,9 @@ class FilesystemTransaction(object):
         Returns:
            file handle of the new file
         """
+        if isinstance(mode, str) or isinstance(mode, unicode):
+            mode = int(mode, 8)
+
         destdir = os.path.dirname(path)
         if not os.path.exists(destdir):
             os.makedirs(destdir, 0o2775)
index 15b79a6368170e988b7fa8428f917359b4395907..202aa57005045ac86d10073d02013d75505b1796 100755 (executable)
@@ -141,11 +141,15 @@ re_includeinpdiff = re.compile(r"(Translation-[a-zA-Z_]+\.(?:bz2|xz))")
 re_file_safe = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_.:~+-]*$')
 
 # Prefix of binary and source filenames
-_re_file_prefix = '^(?P<package>[a-z0-9][a-z0-9.+-]+)_(?P<version>[A-Za-z0-9.:~+-]+)'
+_re_file_prefix = r'^(?P<package>[a-z0-9][a-z0-9.+-]+)_(?P<version>[A-Za-z0-9.:~+-]+?)'
 
 # Match binary packages
 # Groups: package, version, architecture, type
-re_file_binary = re.compile(_re_file_prefix + '_(?P<architecture>[a-z0-9]+)\.(?P<type>u?deb)$')
+re_file_binary = re.compile(_re_file_prefix + r'_(?P<architecture>[a-z0-9]+)\.(?P<type>u?deb)$')
+
+# Match changes files
+# Groups: package, version, suffix
+re_file_changes = re.compile(_re_file_prefix + r'_(?P<suffix>[a-zA-Z0-9+-]+)\.changes$')
 
 # Match dsc files
 # Groups: package, version
@@ -153,7 +157,7 @@ re_file_dsc = re.compile(_re_file_prefix + r'\.dsc$')
 
 # Match other source files
 # Groups: package, version
-re_file_source = re.compile(_re_file_prefix + r'(?:(?:\.orig(?:-[a-zA-Z0-9-]+)?)?\.tar\.(?:bz2|gz|xz)|\.diff\.gz)$')
+re_file_source = re.compile(_re_file_prefix + r'(?:(?:\.orig(?:-[a-zA-Z0-9-]+)?|\.debian)?\.tar\.(?:bz2|gz|xz)|\.diff\.gz)$')
 
 # Match upstream tarball
 # Groups: package, version
index 03df5d8590657c9273b5eb1e7fac05db2a0ce19c..c9cc4ed380e7a6885b109b154b45893d5c046acc 100644 (file)
@@ -34,6 +34,8 @@ def force_to_utf8(s):
     Forces a string to UTF-8.  If the string isn't already UTF-8,
     it's assumed to be ISO-8859-1.
     """
+    if isinstance(s, unicode):
+        return s
     try:
         unicode(s, 'utf-8')
         return s
index 83f556b27d0f2c8f5010b346f6c7eed0aedeacdb..242400a9ed0e012ae85da33680e327ccd2e74788 100755 (executable)
@@ -1064,43 +1064,6 @@ def parse_args(Options):
 
 ################################################################################
 
-# Inspired(tm) by Bryn Keller's print_exc_plus (See
-# http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/52215)
-
-def print_exc():
-    tb = sys.exc_info()[2]
-    while tb.tb_next:
-        tb = tb.tb_next
-    stack = []
-    frame = tb.tb_frame
-    while frame:
-        stack.append(frame)
-        frame = frame.f_back
-    stack.reverse()
-    traceback.print_exc()
-    for frame in stack:
-        print "\nFrame %s in %s at line %s" % (frame.f_code.co_name,
-                                             frame.f_code.co_filename,
-                                             frame.f_lineno)
-        for key, value in frame.f_locals.items():
-            print "\t%20s = " % key,
-            try:
-                print value
-            except:
-                print "<unable to print>"
-
-################################################################################
-
-def try_with_debug(function):
-    try:
-        function()
-    except SystemExit:
-        raise
-    except:
-        print_exc()
-
-################################################################################
-
 def arch_compare_sw (a, b):
     """
     Function for use in sorting lists of architectures.
@@ -1424,7 +1387,7 @@ def gpg_get_key_addresses(fingerprint):
     addresses = key_uid_email_cache.get(fingerprint)
     if addresses != None:
         return addresses
-    addresses = set()
+    addresses = list()
     cmd = "gpg --no-default-keyring %s --fingerprint %s" \
                 % (gpg_keyring_args(), fingerprint)
     (result, output) = commands.getstatusoutput(cmd)
@@ -1432,45 +1395,12 @@ def gpg_get_key_addresses(fingerprint):
         for l in output.split('\n'):
             m = re_gpg_uid.match(l)
             if m:
-                addresses.add(m.group(1))
+                addresses.append(m.group(1))
     key_uid_email_cache[fingerprint] = addresses
     return addresses
 
 ################################################################################
 
-# Inspired(tm) by http://www.zopelabs.com/cookbook/1022242603
-
-def wrap(paragraph, max_length, prefix=""):
-    line = ""
-    s = ""
-    have_started = 0
-    words = paragraph.split()
-
-    for word in words:
-        word_size = len(word)
-        if word_size > max_length:
-            if have_started:
-                s += line + '\n' + prefix
-            s += word + '\n' + prefix
-        else:
-            if have_started:
-                new_length = len(line) + word_size + 1
-                if new_length > max_length:
-                    s += line + '\n' + prefix
-                    line = word
-                else:
-                    line += ' ' + word
-            else:
-                line = word
-        have_started = 1
-
-    if have_started:
-        s += line
-
-    return s
-
-################################################################################
-
 def clean_symlink (src, dest, root):
     """
     Relativize an absolute symlink from 'src' -> 'dest' relative to 'root'.
@@ -1632,3 +1562,27 @@ def get_packages_from_ftp(root, suite, component, architecture):
 def deb_extract_control(fh):
     """extract DEBIAN/control from a binary package"""
     return apt_inst.DebFile(fh).control.extractdata("control")
+
+################################################################################
+
+def mail_addresses_for_upload(maintainer, changed_by, fingerprint):
+    """Mail addresses to contact for an upload
+
+    Args:
+       maintainer (str): Maintainer field of the changes file
+       changed_by (str): Changed-By field of the changes file
+       fingerprint (str): Fingerprint of the PGP key used to sign the upload
+
+    Returns:
+       List of RFC 2047-encoded mail addresses to contact regarding this upload
+    """
+    addresses = [maintainer]
+    if changed_by != maintainer:
+        addresses.append(changed_by)
+
+    fpr_addresses = gpg_get_key_addresses(fingerprint)
+    if fix_maintainer(changed_by)[3] not in fpr_addresses and fix_maintainer(maintainer)[3] not in fpr_addresses:
+        addresses.append(fpr_addresses[0])
+
+    encoded_addresses = [ fix_maintainer(e)[1] for e in addresses ]
+    return encoded_addresses
diff --git a/templates/process-accepted.install b/templates/process-accepted.install
deleted file mode 100644 (file)
index c807c78..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-From: __DAK_ADDRESS__
-To: __MAINTAINER_TO__
-__BCC__
-X-Debian: DAK
-X-Debian-Package: __SOURCE__
-Precedence: bulk
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-Subject: __CHANGES_FILENAME__ INSTALLED into __SUITE__
-
-__REJECT_MESSAGE__
-Installing:
-__SUMMARY__
-
-Thank you for your contribution to __DISTRO__.
diff --git a/templates/process-unchecked.bug-experimental-fixed b/templates/process-unchecked.bug-experimental-fixed
deleted file mode 100644 (file)
index 34c5ca5..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: __MAINTAINER_FROM__
-To: control@__BUG_SERVER__
-Cc: __MAINTAINER_TO__
-__BCC__
-X-Debian: DAK
-X-Debian-Package: __SOURCE__
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-Subject: Fixed in upload of __SOURCE__ __VERSION__ to experimental
-
-__CONTROL_MESSAGE__
-quit
-
-This message was generated automatically in response to an
-upload to the experimental distribution.  The .changes file follows.
-
-__FILE_CONTENTS__
diff --git a/templates/process-unchecked.bug-nmu-fixed b/templates/process-unchecked.bug-nmu-fixed
deleted file mode 100644 (file)
index 45f6c73..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-From: __MAINTAINER_FROM__
-To: control@__BUG_SERVER__
-Cc: __MAINTAINER_TO__
-__BCC__
-X-Debian: DAK
-X-Debian-Package: __SOURCE__
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-Subject: Fixed in NMU of __SOURCE__ __VERSION__
-
-__CONTROL_MESSAGE__
-quit
-
-This message was generated automatically in response to a
-non-maintainer upload.  The .changes file follows.
-
-__FILE_CONTENTS__
diff --git a/templates/reject-proposed-updates.rejected b/templates/reject-proposed-updates.rejected
deleted file mode 100644 (file)
index 8b86cb5..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From: __DAK_ADDRESS__
-To: __MAINTAINER_TO__
-__CC__
-__BCC__
-Reply-To: __STABLE_MAIL__
-X-Debian: DAK
-X-Debian-Package: __SOURCE__
-Precedence: bulk
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-Subject: __CHANGES_FILENAME__ REJECTED from proposed-updates
-
-Your package was rejected by an ftp master on behalf of
-__STABLE_REJECTOR__, if you have any questions or
-comments regarding this rejection, please address them to 
-__STABLE_REJECTOR__ by replying to this mail.
-
-The reason given for rejection was:
-
-__MANUAL_REJECT_MESSAGE__
-
-Please see:
-
-   __MORE_INFO_URL__
-
-for more details.
-
-===
-
-Your rejected .changes files is in queue/REJECT/; the other files
-have been removed from proposed-updates and will be auto-cleaned as
-normal.
diff --git a/templates/security-install.advisory b/templates/security-install.advisory
deleted file mode 100644 (file)
index 9036bd0..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-From: __DAK_ADDRESS__
-To: __WHOAMI__ <dak@security.debian.org>
-__BCC__
-X-Debian-Package: __SOURCE__
-Subject: Template Advisory __ADVISORY__
-
-------------------------------------------------------------------------
-Debian Security Advisory __ADVISORY__                  security@debian.org
-http://www.debian.org/security/                         __WHOAMI__
-__DATE__                   http://www.debian.org/security/faq
-------------------------------------------------------------------------
-
-Package        : __PACKAGE__
-Vulnerability  : XXX
-Problem type   : local/remote XXX
-Debian-specific: XXX
-CVE Id(s)      : XXX
-CERT advisory  : XXX
-BugTraq ID     : XXX
-Debian Bug     : XXX
-
-Several local/remote vulnerabilities have been discovered in...
-The Common
-Vulnerabilities and Exposures project identifies the following problems:
-
-[single issue]
-Foo discovered that
-
-
-[single issue]
-For the old stable distribution (etch), this problem has been fixed in version XXX
-__PACKAGE__
-
-For the stable distribution (lenny), this problem has been fixed in version XXX
-__PACKAGE__
-
-For the unstable distribution (sid), this problem has been fixed in
-version XXX
-
-[multiple issues]
-For the old stable distribution (etch), these problems have been fixed in version
-__PACKAGE__
-
-For the stable distribution (lenny), these problems have been fixed in version
-__PACKAGE__
-
-For the unstable distribution (sid), these problems have been fixed in
-version XXX
-
-We recommend that you upgrade your __PACKAGE__ package.
-
-Upgrade instructions
---------------------
-
-wget url
-        will fetch the file for you
-dpkg -i file.deb
-        will install the referenced file.
-
-If you are using the apt-get package manager, use the line for
-sources.list as given below:
-
-apt-get update
-        will update the internal database
-apt-get upgrade
-        will install corrected packages
-
-You may use an automated update by adding the resources from the
-footer to the proper configuration.
-
-
-Debian GNU/Linux 4.0 alias etch
--------------------------------
-
-Debian GNU/Linux 5.0 alias lenny
---------------------------------
-
-__ADVISORY_TEXT__
-
-
-  These files will probably be moved into the stable distribution on
-  its next update.
-
----------------------------------------------------------------------------------
-For apt-get: deb http://security.debian.org/ stable/updates main
-For dpkg-ftp: ftp://security.debian.org/debian-security dists/stable/updates/main
-Mailing list: debian-security-announce@lists.debian.org
-Package info: `apt-cache show <pkg>' and http://packages.debian.org/<pkg>
diff --git a/tests/fixtures/packages/.gitignore b/tests/fixtures/packages/.gitignore
new file mode 100644 (file)
index 0000000..258ed43
--- /dev/null
@@ -0,0 +1,8 @@
+/*.changes
+/*.deb
+/*.diff.gz
+/*.dsc
+/*.tar.gz
+/stamp-*
+
+/*/debian/files
diff --git a/tests/fixtures/packages/Makefile b/tests/fixtures/packages/Makefile
new file mode 100644 (file)
index 0000000..0efd18c
--- /dev/null
@@ -0,0 +1,31 @@
+export GNUPGHOME = $(CURDIR)/gpg
+SHELL = /bin/bash
+
+TAR = nonfree-package_0.1 package_0.1 package-built-using_0.1
+PACKAGES = $(TAR) package_0.1-2 package_0.1-3
+
+all: packages
+
+tarballs: stamp-tarballs
+stamp-tarballs:
+       set -e; for t in $(TAR); do \
+          if [ ! -f $$t.orig.tar.gz ]; then \
+           tar -czf $$t.orig.tar.gz --exclude=debian $${t/_/-}; \
+         fi; \
+       done
+       touch $@
+
+packages: stamp-packages
+stamp-packages: stamp-tarballs
+       set -e; for p in $(PACKAGES); do \
+         (cd $${p/_/-}; dpkg-buildpackage); \
+       done
+       touch $@
+
+clean:
+       set -e; for p in $(PACKAGES); do \
+         make -C $${p/_/-} -f debian/rules clean; \
+       done
+       rm -f *.tar.gz *.dsc *.changes *.diff.gz *.deb
+       rm -f gpg/*~
+       rm -f stamp-*
diff --git a/tests/fixtures/packages/gpg/pubring.gpg b/tests/fixtures/packages/gpg/pubring.gpg
new file mode 100644 (file)
index 0000000..469c3f3
Binary files /dev/null and b/tests/fixtures/packages/gpg/pubring.gpg differ
diff --git a/tests/fixtures/packages/gpg/random_seed b/tests/fixtures/packages/gpg/random_seed
new file mode 100644 (file)
index 0000000..2f6cb5e
Binary files /dev/null and b/tests/fixtures/packages/gpg/random_seed differ
diff --git a/tests/fixtures/packages/gpg/secring.gpg b/tests/fixtures/packages/gpg/secring.gpg
new file mode 100644 (file)
index 0000000..e781f1b
Binary files /dev/null and b/tests/fixtures/packages/gpg/secring.gpg differ
diff --git a/tests/fixtures/packages/gpg/trustdb.gpg b/tests/fixtures/packages/gpg/trustdb.gpg
new file mode 100644 (file)
index 0000000..d0ac562
Binary files /dev/null and b/tests/fixtures/packages/gpg/trustdb.gpg differ
diff --git a/tests/fixtures/packages/nonfree-package-0.1/debian/changelog b/tests/fixtures/packages/nonfree-package-0.1/debian/changelog
new file mode 100644 (file)
index 0000000..ec3f4a1
--- /dev/null
@@ -0,0 +1,5 @@
+nonfree-package (0.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- A Maintainer <maint@example.com>  Fri, 08 Jun 2012 18:10:01 +0200
diff --git a/tests/fixtures/packages/nonfree-package-0.1/debian/compat b/tests/fixtures/packages/nonfree-package-0.1/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/tests/fixtures/packages/nonfree-package-0.1/debian/control b/tests/fixtures/packages/nonfree-package-0.1/debian/control
new file mode 100644 (file)
index 0000000..f83f69c
--- /dev/null
@@ -0,0 +1,11 @@
+Source: nonfree-package
+Section: non-free/misc
+Priority: extra
+Maintainer: A Maintainer <maint@example.com>
+Build-Depends: debhelper (>= 7)
+
+Package: nonfree-package
+Architecture: all
+Depends: ${misc:Depends}
+Description: a package
+ a package
diff --git a/tests/fixtures/packages/nonfree-package-0.1/debian/nonfree-package.install b/tests/fixtures/packages/nonfree-package-0.1/debian/nonfree-package.install
new file mode 100644 (file)
index 0000000..af6371d
--- /dev/null
@@ -0,0 +1 @@
+some-file usr/share/nonfree-package
diff --git a/tests/fixtures/packages/nonfree-package-0.1/debian/rules b/tests/fixtures/packages/nonfree-package-0.1/debian/rules
new file mode 100755 (executable)
index 0000000..78c7615
--- /dev/null
@@ -0,0 +1,3 @@
+#! /usr/bin/make -f
+%:
+       dh $@
diff --git a/tests/fixtures/packages/nonfree-package-0.1/some-file b/tests/fixtures/packages/nonfree-package-0.1/some-file
new file mode 100644 (file)
index 0000000..083d0c2
--- /dev/null
@@ -0,0 +1 @@
+some-text
diff --git a/tests/fixtures/packages/package-0.1/debian/changelog b/tests/fixtures/packages/package-0.1/debian/changelog
new file mode 100644 (file)
index 0000000..fbb1609
--- /dev/null
@@ -0,0 +1,5 @@
+package (0.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- A Maintainer <maint@example.com>  Fri, 08 Jun 2012 18:10:01 +0200
diff --git a/tests/fixtures/packages/package-0.1/debian/compat b/tests/fixtures/packages/package-0.1/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/tests/fixtures/packages/package-0.1/debian/control b/tests/fixtures/packages/package-0.1/debian/control
new file mode 100644 (file)
index 0000000..9ccf58a
--- /dev/null
@@ -0,0 +1,11 @@
+Source: package
+Section: misc
+Priority: extra
+Maintainer: A Maintainer <maint@example.com>
+Build-Depends: debhelper (>= 7)
+
+Package: package
+Architecture: all
+Depends: ${misc:Depends}
+Description: a package
+ a package
diff --git a/tests/fixtures/packages/package-0.1/debian/package.install b/tests/fixtures/packages/package-0.1/debian/package.install
new file mode 100644 (file)
index 0000000..fb44f77
--- /dev/null
@@ -0,0 +1 @@
+some-file usr/share/apackage
diff --git a/tests/fixtures/packages/package-0.1/debian/rules b/tests/fixtures/packages/package-0.1/debian/rules
new file mode 100755 (executable)
index 0000000..78c7615
--- /dev/null
@@ -0,0 +1,3 @@
+#! /usr/bin/make -f
+%:
+       dh $@
diff --git a/tests/fixtures/packages/package-0.1/some-file b/tests/fixtures/packages/package-0.1/some-file
new file mode 100644 (file)
index 0000000..083d0c2
--- /dev/null
@@ -0,0 +1 @@
+some-text
diff --git a/tests/fixtures/packages/package-built-using-0.1/debian/changelog b/tests/fixtures/packages/package-built-using-0.1/debian/changelog
new file mode 100644 (file)
index 0000000..744ddf6
--- /dev/null
@@ -0,0 +1,5 @@
+package-built-using (0.1-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- A Maintainer <maint@example.com>  Fri, 08 Jun 2012 18:10:01 +0200
diff --git a/tests/fixtures/packages/package-built-using-0.1/debian/compat b/tests/fixtures/packages/package-built-using-0.1/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
@@ -0,0 +1 @@
+7
diff --git a/tests/fixtures/packages/package-built-using-0.1/debian/control b/tests/fixtures/packages/package-built-using-0.1/debian/control
new file mode 100644 (file)
index 0000000..b51cc53
--- /dev/null
@@ -0,0 +1,12 @@
+Source: package-built-using
+Section: misc
+Priority: extra
+Maintainer: A Maintainer <maint@example.com>
+Build-Depends: debhelper (>= 7)
+
+Package: package-built-using
+Architecture: all
+Depends: ${misc:Depends}
+Built-Using: package (= 0.1-1)
+Description: a package
+ a package
diff --git a/tests/fixtures/packages/package-built-using-0.1/debian/package-built-using.install b/tests/fixtures/packages/package-built-using-0.1/debian/package-built-using.install
new file mode 100644 (file)
index 0000000..fb44f77
--- /dev/null
@@ -0,0 +1 @@
+some-file usr/share/apackage
diff --git a/tests/fixtures/packages/package-built-using-0.1/debian/rules b/tests/fixtures/packages/package-built-using-0.1/debian/rules
new file mode 100755 (executable)
index 0000000..78c7615
--- /dev/null
@@ -0,0 +1,3 @@
+#! /usr/bin/make -f
+%:
+       dh $@
diff --git a/tests/fixtures/packages/package-built-using-0.1/some-file b/tests/fixtures/packages/package-built-using-0.1/some-file
new file mode 100644 (file)
index 0000000..083d0c2
--- /dev/null
@@ -0,0 +1 @@
+some-text