Merge repository into pgapt.git.

diff --git a/debian/changelog b/debian/changelog
index 46e006ae75184593b3b4c099b9fda515016d4cdb..0aeea7dbeda20939222a92016371697857c2f67b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pgdg-buildenv (17) sid-pgdg-UNRELEASED; urgency=medium
   * Add /usr/bin/adt-sbuild.
   * Add /usr/sbin/policy-rc.d.
   * Add /etc/sudoers.d/sbuild.
+  * Merge repository into pgapt.git.
 
  -- Christoph Berg <christoph.berg@credativ.de>  Thu, 08 Jan 2015 15:39:00 +0100
 

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/debian/control b/debian/control
index c6f3f70c221f253b0c2c55ef8d5e7ccc2db384c3..05cf842801fcae61033efef4875eafe2e6f64bdf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Maintainer: Debian PostgreSQL Maintainers <pkg-postgresql-public@lists.alioth.de
 Uploaders: Christoph Berg <myon@debian.org>
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9~)
-Vcs-Browser: https://github.com/ChristophBerg/pgdg-buildenv
-Vcs-Git: git://github.com/ChristophBerg/pgdg-buildenv.git
-Homepage: http://apt.postgresql.org/
+Vcs-Browser: http://git.postgresql.org/gitweb/?p=pgapt.git
+Vcs-Git: git://git.postgresql.org/git/pgapt.git
+Homepage: https://apt.postgresql.org/
 
 Package: pgdg-buildenv
 Architecture: all

diff --git a/debian/copyright b/debian/copyright
index abcd71ee555d0005e08cd5b23f8a41c4e9b0713c..acfa13e7377902e1d18ff3ed51bcbe66948e8ae7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
 Author, Copyright, and Debianization:
-Copyright (C) 2013 Christoph Berg <myon@debian.org>
+Copyright (C) 2013-2015 Christoph Berg <myon@debian.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

diff --git a/debian/pgdg-buildenv.install b/debian/pgdg-buildenv.install
index e74e38676a3c8dc7bfc09db6467a62e5be2ab46b..7cfcb5e338cd3183512d26717b923252650954f6 100644 (file)
--- a/debian/pgdg-buildenv.install
+++ b/debian/pgdg-buildenv.install
@@ -1,3 +1,3 @@
-etc
-bin usr
-sbin usr
+pgdg-buildenv/etc /
+jenkins/adt-sbuild usr/bin
+pgdg-buildenv/sbin usr

diff --git a/debian/source/options b/debian/source/options
new file mode 100644 (file)
index 0000000..86e1a61
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+tar-ignore=repo
+tar-ignore=jenkins/output*

diff --git a/bin/adt-sbuild b/jenkins/adt-sbuild
similarity index 100%
rename from bin/adt-sbuild
rename to jenkins/adt-sbuild

diff --git a/jenkins/pgapt-jobs.yaml b/jenkins/pgapt-jobs.yaml
index dd3a55e26e219b752fb1af123346bd17e88952aa..a2927c35e35d27736f10f84a0c7498e8a0780998 100644 (file)
--- a/jenkins/pgapt-jobs.yaml
+++ b/jenkins/pgapt-jobs.yaml
@@ -754,7 +754,7 @@
 
 - project:
         name: pgdg-buildenv
-        git-url: https://github.com/ChristophBerg/pgdg-buildenv.git
+        git-url: git://git.postgresql.org/git/pgapt.git
         git-branch: master
         dist-filter: ''
         jobs:

diff --git a/etc/apt/apt.conf.d/20norecommends b/pgdg-buildenv/etc/apt/apt.conf.d/20norecommends
similarity index 100%
rename from etc/apt/apt.conf.d/20norecommends
rename to pgdg-buildenv/etc/apt/apt.conf.d/20norecommends

diff --git a/etc/apt/apt.conf.d/50i18n b/pgdg-buildenv/etc/apt/apt.conf.d/50i18n
similarity index 100%
rename from etc/apt/apt.conf.d/50i18n
rename to pgdg-buildenv/etc/apt/apt.conf.d/50i18n

diff --git a/etc/apt/preferences.d/pgdg.pref b/pgdg-buildenv/etc/apt/preferences.d/pgdg.pref
similarity index 100%
rename from etc/apt/preferences.d/pgdg.pref
rename to pgdg-buildenv/etc/apt/preferences.d/pgdg.pref

diff --git a/etc/dpkg/dpkg.cfg.d/01unsafeio b/pgdg-buildenv/etc/dpkg/dpkg.cfg.d/01unsafeio
similarity index 100%
rename from etc/dpkg/dpkg.cfg.d/01unsafeio
rename to pgdg-buildenv/etc/dpkg/dpkg.cfg.d/01unsafeio

diff --git a/etc/sudoers.d/sbuild b/pgdg-buildenv/etc/sudoers.d/sbuild
similarity index 100%
rename from etc/sudoers.d/sbuild
rename to pgdg-buildenv/etc/sudoers.d/sbuild

diff --git a/sbin/policy-rc.d b/pgdg-buildenv/sbin/policy-rc.d
similarity index 100%
rename from sbin/policy-rc.d
rename to pgdg-buildenv/sbin/policy-rc.d